diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index 6197b97..54e3b1d 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig index 591b5fe..59953d7 100644 --- a/arch/arm/configs/at91sam9261ek_defconfig +++ b/arch/arm/configs/at91sam9261ek_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/at91sam9261ek_first_stage_defconfig b/arch/arm/configs/at91sam9261ek_first_stage_defconfig index 6071aea..465f167 100644 --- a/arch/arm/configs/at91sam9261ek_first_stage_defconfig +++ b/arch/arm/configs/at91sam9261ek_first_stage_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/configs/at91sam9g10ek_defconfig b/arch/arm/configs/at91sam9g10ek_defconfig index 9c12ed4..862d709 100644 --- a/arch/arm/configs/at91sam9g10ek_defconfig +++ b/arch/arm/configs/at91sam9g10ek_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/at91sam9m10g45ek_defconfig b/arch/arm/configs/at91sam9m10g45ek_defconfig index 02bb983..292b507 100644 --- a/arch/arm/configs/at91sam9m10g45ek_defconfig +++ b/arch/arm/configs/at91sam9m10g45ek_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/at91sam9m10ihd_defconfig b/arch/arm/configs/at91sam9m10ihd_defconfig index cc40850..a39282d 100644 --- a/arch/arm/configs/at91sam9m10ihd_defconfig +++ b/arch/arm/configs/at91sam9m10ihd_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/configs/highbank_defconfig b/arch/arm/configs/highbank_defconfig index 3e02c2e..cf42d29 100644 --- a/arch/arm/configs/highbank_defconfig +++ b/arch/arm/configs/highbank_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/configs/mioa701_defconfig b/arch/arm/configs/mioa701_defconfig index 2046880..20f71e9 100644 --- a/arch/arm/configs/mioa701_defconfig +++ b/arch/arm/configs/mioa701_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_LET=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TIME=y CONFIG_CMD_GLOBAL=y diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index f86b59c..dcb00c0 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/phytec-phycard-omap3_defconfig b/arch/arm/configs/phytec-phycard-omap3_defconfig index e4e441a..aefc78d 100644 --- a/arch/arm/configs/phytec-phycard-omap3_defconfig +++ b/arch/arm/configs/phytec-phycard-omap3_defconfig @@ -73,6 +73,7 @@ CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_LOGIN=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_PASSWD_MODE_STAR=y CONFIG_CMD_TIME=y diff --git a/arch/arm/configs/pm9261_defconfig b/arch/arm/configs/pm9261_defconfig index 682c65f..c6df91a 100644 --- a/arch/arm/configs/pm9261_defconfig +++ b/arch/arm/configs/pm9261_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig index 76029d0..05c0136 100644 --- a/arch/arm/configs/rpi_defconfig +++ b/arch/arm/configs/rpi_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_LET=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TIME=y CONFIG_CMD_LN=y diff --git a/arch/arm/configs/tny_a9260_defconfig b/arch/arm/configs/tny_a9260_defconfig index 30b675f..7615d22 100644 --- a/arch/arm/configs/tny_a9260_defconfig +++ b/arch/arm/configs/tny_a9260_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/tny_a9263_defconfig b/arch/arm/configs/tny_a9263_defconfig index 94d6c10..757584a 100644 --- a/arch/arm/configs/tny_a9263_defconfig +++ b/arch/arm/configs/tny_a9263_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/tny_a9g20_defconfig b/arch/arm/configs/tny_a9g20_defconfig index 6e7ae23..e25d134 100644 --- a/arch/arm/configs/tny_a9g20_defconfig +++ b/arch/arm/configs/tny_a9g20_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/usb_a9260_defconfig b/arch/arm/configs/usb_a9260_defconfig index b6cb61c..5a2ed02 100644 --- a/arch/arm/configs/usb_a9260_defconfig +++ b/arch/arm/configs/usb_a9260_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/usb_a9263_128mib_defconfig b/arch/arm/configs/usb_a9263_128mib_defconfig index 81c502d..b9222e4 100644 --- a/arch/arm/configs/usb_a9263_128mib_defconfig +++ b/arch/arm/configs/usb_a9263_128mib_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/usb_a9263_defconfig b/arch/arm/configs/usb_a9263_defconfig index 78fb26c..da62f48 100644 --- a/arch/arm/configs/usb_a9263_defconfig +++ b/arch/arm/configs/usb_a9263_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/usb_a9g20_128mib_defconfig b/arch/arm/configs/usb_a9g20_128mib_defconfig index 11ca9ee..122e0f6 100644 --- a/arch/arm/configs/usb_a9g20_128mib_defconfig +++ b/arch/arm/configs/usb_a9g20_128mib_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/usb_a9g20_defconfig b/arch/arm/configs/usb_a9g20_defconfig index 2934b21..cc99659 100644 --- a/arch/arm/configs/usb_a9g20_defconfig +++ b/arch/arm/configs/usb_a9g20_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_LOADB=y diff --git a/arch/arm/configs/versatilepb_defconfig b/arch/arm/configs/versatilepb_defconfig index a447f93..9f7e0e5 100644 --- a/arch/arm/configs/versatilepb_defconfig +++ b/arch/arm/configs/versatilepb_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EDIT=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y diff --git a/arch/arm/configs/vexpress_ca9_defconfig b/arch/arm/configs/vexpress_ca9_defconfig index 1da3779..84171c4 100644 --- a/arch/arm/configs/vexpress_ca9_defconfig +++ b/arch/arm/configs/vexpress_ca9_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 6ad2c8a..c7928c4 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_READLINE=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index 1b73a51..ae0172b 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -70,9 +70,7 @@ cs.mult = clocksource_hz2mult(AT91_SLOW_CLOCK, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c index 06d3e32..789e1ec 100644 --- a/arch/arm/mach-at91/at91sam926x_time.c +++ b/arch/arm/mach-at91/at91sam926x_time.c @@ -99,9 +99,7 @@ cs.mult = clocksource_hz2mult(pit_rate, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } static struct driver_d at91_pit_driver = { diff --git a/arch/arm/mach-ep93xx/clocksource.c b/arch/arm/mach-ep93xx/clocksource.c index 26ab91d..f396d0a 100644 --- a/arch/arm/mach-ep93xx/clocksource.c +++ b/arch/arm/mach-ep93xx/clocksource.c @@ -58,9 +58,7 @@ cs.mult = clocksource_hz2mult(TIMER_FREQ, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/arm/mach-mxs/clocksource-imx28.c b/arch/arm/mach-mxs/clocksource-imx28.c index 328ca5d..d26aa93 100644 --- a/arch/arm/mach-mxs/clocksource-imx28.c +++ b/arch/arm/mach-mxs/clocksource-imx28.c @@ -65,9 +65,8 @@ writel(TIMCTRL_UPDATE | TIMCTRL_RELOAD | TIMCTRL_PRESCALE(0) | TIMCTRL_SELECT(0xb), timer_base + TIMCTRL1); imx28_cs.mult = clocksource_hz2mult(CLOCK_TICK_RATE, imx28_cs.shift); - init_clock(&imx28_cs); - return 0; + return init_clock(&imx28_cs); } core_initcall(imx28_clocksource_init); diff --git a/arch/arm/mach-netx/clocksource.c b/arch/arm/mach-netx/clocksource.c index bfce37a..8f53364 100644 --- a/arch/arm/mach-netx/clocksource.c +++ b/arch/arm/mach-netx/clocksource.c @@ -45,9 +45,7 @@ cs.mult = clocksource_hz2mult(100 * 1000 * 1000, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/arm/mach-pxa/clocksource.c b/arch/arm/mach-pxa/clocksource.c index 04d090a..c941f15 100644 --- a/arch/arm/mach-pxa/clocksource.c +++ b/arch/arm/mach-pxa/clocksource.c @@ -37,9 +37,7 @@ { cs.mult = clocksource_hz2mult(3250000, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/arm/mach-samsung/s3c-timer.c b/arch/arm/mach-samsung/s3c-timer.c index fb3cda0..b5118fa 100644 --- a/arch/arm/mach-samsung/s3c-timer.c +++ b/arch/arm/mach-samsung/s3c-timer.c @@ -115,8 +115,7 @@ s3c_timer_start(); cs.mult = clocksource_hz2mult(s3c_get_t4_clk(), cs.shift); - init_clock(&cs); - return 0; + return init_clock(&cs); } core_initcall(s3c_clk_src_init); diff --git a/arch/arm/mach-tegra/tegra20-timer.c b/arch/arm/mach-tegra/tegra20-timer.c index ddc70dc..a8e4d7b 100644 --- a/arch/arm/mach-tegra/tegra20-timer.c +++ b/arch/arm/mach-tegra/tegra20-timer.c @@ -84,9 +84,8 @@ writel(reg, timer_base + TIMERUS_USEC_CFG); cs.mult = clocksource_hz2mult(1000000, cs.shift); - init_clock(&cs); - return 0; + return init_clock(&cs); } static __maybe_unused struct of_device_id tegra20_timer_dt_ids[] = { diff --git a/arch/blackfin/lib/clock.c b/arch/blackfin/lib/clock.c index 7a5673f..aaa042a 100644 --- a/arch/blackfin/lib/clock.c +++ b/arch/blackfin/lib/clock.c @@ -70,9 +70,7 @@ cs.mult = clocksource_hz2mult(get_cclk(), cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/efi/efi/clocksource.c b/arch/efi/efi/clocksource.c index 2f33b43..c92c35b 100644 --- a/arch/efi/efi/clocksource.c +++ b/arch/efi/efi/clocksource.c @@ -54,7 +54,5 @@ freq = ticks_freq(); - init_clock(&cs); - - return 0; + return init_clock(&cs); } diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig index ab29cf3..4c9a06f 100644 --- a/arch/mips/configs/dlink-dir-320_defconfig +++ b/arch/mips/configs/dlink-dir-320_defconfig @@ -37,6 +37,7 @@ CONFIG_CMD_EDIT=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig index 5a1ca36..a5af258 100644 --- a/arch/mips/configs/qemu-malta_defconfig +++ b/arch/mips/configs/qemu-malta_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_EDIT=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y diff --git a/arch/mips/lib/csrc-r4k.c b/arch/mips/lib/csrc-r4k.c index c699f2b..5c3f18f 100644 --- a/arch/mips/lib/csrc-r4k.c +++ b/arch/mips/lib/csrc-r4k.c @@ -38,8 +38,7 @@ static int clocksource_init(void) { cs.mult = clocksource_hz2mult(100000000, cs.shift); - init_clock(&cs); - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/nios2/lib/clock.c b/arch/nios2/lib/clock.c index 67cc778..28aed02 100644 --- a/arch/nios2/lib/clock.c +++ b/arch/nios2/lib/clock.c @@ -49,9 +49,7 @@ cs.mult = clocksource_hz2mult(NIOS_SOPC_TIMER_FREQ, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/openrisc/lib/clock.c b/arch/openrisc/lib/clock.c index 4f36f27..a171214 100644 --- a/arch/openrisc/lib/clock.c +++ b/arch/openrisc/lib/clock.c @@ -38,9 +38,7 @@ mtspr(SPR_TTMR, SPR_TTMR_CR | 0xFFFFFF); cs.mult = clocksource_hz2mult(OPENRISC_TIMER_FREQ, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/ppc/mach-mpc5xxx/time.c b/arch/ppc/mach-mpc5xxx/time.c index 8ba0c5c..699a66d 100644 --- a/arch/ppc/mach-mpc5xxx/time.c +++ b/arch/ppc/mach-mpc5xxx/time.c @@ -41,9 +41,7 @@ cs.mult = clocksource_hz2mult(get_timebase_clock(), cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/ppc/mach-mpc85xx/time.c b/arch/ppc/mach-mpc85xx/time.c index 985ec09..9014fce 100644 --- a/arch/ppc/mach-mpc85xx/time.c +++ b/arch/ppc/mach-mpc85xx/time.c @@ -41,9 +41,7 @@ clocks_calc_mult_shift(&cs.mult, &cs.shift, fsl_get_timebase_clock(), NSEC_PER_SEC, 10); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/sandbox/board/clock.c b/arch/sandbox/board/clock.c index 137e20b..bdea89f 100644 --- a/arch/sandbox/board/clock.c +++ b/arch/sandbox/board/clock.c @@ -37,9 +37,7 @@ { cs.mult = clocksource_hz2mult(1000 * 1000 * 1000, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/arch/x86/mach-i386/pit_timer.c b/arch/x86/mach-i386/pit_timer.c index fbc7a10..857ba31 100644 --- a/arch/x86/mach-i386/pit_timer.c +++ b/arch/x86/mach-i386/pit_timer.c @@ -59,9 +59,8 @@ static int clocksource_init (void) { cs.mult = clocksource_hz2mult(1193182, cs.shift); - init_clock(&cs); - return 0; + return init_clock(&cs); } core_initcall(clocksource_init); diff --git a/commands/Kconfig b/commands/Kconfig index 494a019..52ba8b3 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -88,6 +88,7 @@ tristate prompt "dmesg" select LOGBUF + depends on !CONSOLE_NONE help Print or control the log message buffer. @@ -1262,6 +1263,7 @@ config CMD_LOGIN tristate select PASSWORD + depends on !CONSOLE_NONE prompt "login" help Ask for a password @@ -1370,7 +1372,7 @@ config CMD_PASSWD tristate - select CMD_LOGIN + depends on CMD_LOGIN prompt "passwd" help Set password diff --git a/common/partitions/efi.c b/common/partitions/efi.c index dcb9541..61abf00 100644 --- a/common/partitions/efi.c +++ b/common/partitions/efi.c @@ -55,7 +55,7 @@ { if (!bdev) return 0; - return bdev->num_blocks; + return bdev->num_blocks - 1; } /** diff --git a/drivers/clocksource/amba-sp804.c b/drivers/clocksource/amba-sp804.c index fedcb64..c5ad994 100644 --- a/drivers/clocksource/amba-sp804.c +++ b/drivers/clocksource/amba-sp804.c @@ -66,9 +66,7 @@ sp804_clksrc.mult = clocksource_hz2mult(tick_rate, sp804_clksrc.shift); - init_clock(&sp804_clksrc); - - return 0; + return init_clock(&sp804_clksrc); } static struct amba_id sp804_ids[] = { diff --git a/drivers/clocksource/arm_smp_twd.c b/drivers/clocksource/arm_smp_twd.c index 72045b0..c0296cd 100644 --- a/drivers/clocksource/arm_smp_twd.c +++ b/drivers/clocksource/arm_smp_twd.c @@ -86,9 +86,7 @@ smp_twd_clksrc.mult = clocksource_hz2mult(tick_rate, smp_twd_clksrc.shift); - init_clock(&smp_twd_clksrc); - - return 0; + return init_clock(&smp_twd_clksrc); } static __maybe_unused struct of_device_id smp_twd_compatible[] = { diff --git a/drivers/clocksource/bcm2835.c b/drivers/clocksource/bcm2835.c index c0b1aae..0cb8e57 100644 --- a/drivers/clocksource/bcm2835.c +++ b/drivers/clocksource/bcm2835.c @@ -66,9 +66,8 @@ return PTR_ERR(stc_base); clocks_calc_mult_shift(&bcm2835_stc.mult, &bcm2835_stc.shift, rate, NSEC_PER_SEC, 60); - init_clock(&bcm2835_stc); - return 0; + return init_clock(&bcm2835_stc); } static __maybe_unused struct of_device_id bcm2835_cs_dt_ids[] = { diff --git a/drivers/clocksource/dummy.c b/drivers/clocksource/dummy.c index 154a8cd..96f9b6e 100644 --- a/drivers/clocksource/dummy.c +++ b/drivers/clocksource/dummy.c @@ -49,8 +49,7 @@ pr_debug("clocksource_init: mult=%08x, shift=%08x\n", dummy_cs.mult, dummy_cs.shift); - init_clock(&dummy_cs); - return 0; + return init_clock(&dummy_cs); } pure_initcall(clocksource_init); diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c index b8fa985..88db0b0 100644 --- a/drivers/clocksource/mvebu.c +++ b/drivers/clocksource/mvebu.c @@ -88,9 +88,7 @@ cs.mult = clocksource_hz2mult(rate, cs.shift); - init_clock(&cs); - - return 0; + return init_clock(&cs); } static struct of_device_id mvebu_timer_dt_ids[] = { diff --git a/drivers/clocksource/nomadik.c b/drivers/clocksource/nomadik.c index d7edf06..48f4715 100644 --- a/drivers/clocksource/nomadik.c +++ b/drivers/clocksource/nomadik.c @@ -132,9 +132,7 @@ nmdk_clksrc.mult = clocksource_hz2mult(rate, nmdk_clksrc.shift); - init_clock(&nmdk_clksrc); - - return 0; + return init_clock(&nmdk_clksrc); } static struct driver_d nmdk_mtu_driver = { diff --git a/drivers/clocksource/orion.c b/drivers/clocksource/orion.c index a1dafd8..2e40b49 100644 --- a/drivers/clocksource/orion.c +++ b/drivers/clocksource/orion.c @@ -62,9 +62,8 @@ timer_base + TIMER_CTRL); clksrc.mult = clocksource_hz2mult(clk_get_rate(tclk), clksrc.shift); - init_clock(&clksrc); - return 0; + return init_clock(&clksrc); } static struct of_device_id orion_timer_dt_ids[] = { diff --git a/drivers/clocksource/uemd.c b/drivers/clocksource/uemd.c index 6c37de5..d4291dd 100644 --- a/drivers/clocksource/uemd.c +++ b/drivers/clocksource/uemd.c @@ -105,9 +105,7 @@ clocks_calc_mult_shift(&uemd_cs.mult, &uemd_cs.shift, clk_get_rate(timer_clk), NSEC_PER_SEC, 10); - init_clock(&uemd_cs); - - return 0; + return init_clock(&uemd_cs); } static __maybe_unused struct of_device_id uemd_timer_dt_ids[] = { diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 97378ab..90475cf 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -4,7 +4,7 @@ config OFTREE_MEM_GENERIC depends on OFTREE - depends on PPC || ARM || ARCH_EFI || OPENRISC + depends on PPC || ARM || ARCH_EFI || OPENRISC || SANDBOX def_bool y config DTC diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index cfe1833..84c38fd 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -54,7 +54,7 @@ * Parse a flat device tree binary blob and return a pointer to the * unflattened tree. */ -struct device_node *of_unflatten_dtb(void *infdt) +struct device_node *of_unflatten_dtb(const void *infdt) { const void *nodep; /* property node pointer */ uint32_t tag; /* tag */ @@ -69,7 +69,7 @@ struct fdt_header f; int ret; unsigned int maxlen; - struct fdt_header *fdt = infdt; + const struct fdt_header *fdt = infdt; if (fdt->magic != cpu_to_fdt32(FDT_MAGIC)) { pr_err("bad magic: 0x%08x\n", fdt32_to_cpu(fdt->magic)); @@ -120,18 +120,14 @@ goto err; } - dt_struct = dt_struct_advance(&f, dt_struct, - sizeof(struct fdt_node_header) + len + 1); - if (!dt_struct) { - ret = -ESPIPE; - goto err; - } - if (!node) node = root; else node = of_new_node(node, pathp); + dt_struct = dt_struct_advance(&f, dt_struct, + sizeof(struct fdt_node_header) + len + 1); + break; case FDT_END_NODE: @@ -144,10 +140,6 @@ node = node->parent; dt_struct = dt_struct_advance(&f, dt_struct, FDT_TAGSIZE); - if (!dt_struct) { - ret = -ESPIPE; - goto err; - } break; @@ -162,25 +154,17 @@ goto err; } - dt_struct = dt_struct_advance(&f, dt_struct, - sizeof(struct fdt_property) + len); - if (!dt_struct) { - ret = -ESPIPE; - goto err; - } - p = of_new_property(node, name, nodep, len); if (!strcmp(name, "phandle") && len == 4) node->phandle = be32_to_cpup(p->value); + dt_struct = dt_struct_advance(&f, dt_struct, + sizeof(struct fdt_property) + len); + break; case FDT_NOP: dt_struct = dt_struct_advance(&f, dt_struct, FDT_TAGSIZE); - if (!dt_struct) { - ret = -ESPIPE; - goto err; - } break; @@ -192,6 +176,11 @@ ret = -EINVAL; goto err; } + + if (!dt_struct) { + ret = -ESPIPE; + goto err; + } } err: of_delete_node(root); diff --git a/include/of.h b/include/of.h index 7b93c58..5273f87 100644 --- a/include/of.h +++ b/include/of.h @@ -98,7 +98,7 @@ void of_print_nodes(struct device_node *node, int indent); int of_probe(void); int of_parse_dtb(struct fdt_header *fdt); -struct device_node *of_unflatten_dtb(void *fdt); +struct device_node *of_unflatten_dtb(const void *fdt); struct cdev; diff --git a/include/stringlist.h b/include/stringlist.h index 127998c..e85500a 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -8,10 +8,10 @@ char *str; }; -int string_list_add(struct string_list *sl, char *str); +int string_list_add(struct string_list *sl, const char *str); int string_list_add_asprintf(struct string_list *sl, const char *fmt, ...); -int string_list_add_sorted(struct string_list *sl, char *str); -int string_list_contains(struct string_list *sl, char *str); +int string_list_add_sorted(struct string_list *sl, const char *str); +int string_list_contains(struct string_list *sl, const char *str); void string_list_print_by_column(struct string_list *sl); static inline void string_list_init(struct string_list *sl) diff --git a/lib/stringlist.c b/lib/stringlist.c index cc84944..8a18366 100644 --- a/lib/stringlist.c +++ b/lib/stringlist.c @@ -13,7 +13,7 @@ return strcmp(astr, bstr); } -int string_list_add(struct string_list *sl, char *str) +int string_list_add(struct string_list *sl, const char *str) { struct string_list *new; @@ -48,7 +48,7 @@ return 0; } -int string_list_add_sorted(struct string_list *sl, char *str) +int string_list_add_sorted(struct string_list *sl, const char *str) { struct string_list *new; @@ -60,7 +60,7 @@ return 0; } -int string_list_contains(struct string_list *sl, char *str) +int string_list_contains(struct string_list *sl, const char *str) { struct string_list *entry;