diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-28 13:16:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-28 13:16:52 -0700 |
| commit | dca50f08a03eba5bc7a6afecca3f8ab0029b7a6e (patch) | |
| tree | 4f41b94e2d3f71ccb2ee2085b9d7171fc0767a1a /arch | |
| parent | Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt (diff) | |
| parent | NIOS2: setup.c: drop unused variable 'dram_start' (diff) | |
| download | linux-dev-dca50f08a03eba5bc7a6afecca3f8ab0029b7a6e.tar.xz linux-dev-dca50f08a03eba5bc7a6afecca3f8ab0029b7a6e.zip | |
Merge tag 'nios2_fixes_for_v5.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
Pull nios2 fixes from Dinh Nguyen:
- Fix build warning for unmet dependency for EARLY_PRINTK
- Remove unused dram_start() function
* tag 'nios2_fixes_for_v5.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
NIOS2: setup.c: drop unused variable 'dram_start'
NIOS2: fix kconfig unmet dependency warning for SERIAL_CORE_CONSOLE
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nios2/Kconfig.debug | 3 | ||||
| -rw-r--r-- | arch/nios2/kernel/setup.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/nios2/Kconfig.debug b/arch/nios2/Kconfig.debug index a8bc06e96ef5..ca1beb87f987 100644 --- a/arch/nios2/Kconfig.debug +++ b/arch/nios2/Kconfig.debug @@ -3,9 +3,10 @@ config EARLY_PRINTK bool "Activate early kernel debugging" default y + depends on TTY select SERIAL_CORE_CONSOLE help - Enable early printk on console + Enable early printk on console. This is useful for kernel debugging when your machine crashes very early before the console code is initialized. You should normally say N here, unless you want to debug such a crash. diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index cf8d687a2644..40bc8fb75e0b 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -149,8 +149,6 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low, void __init setup_arch(char **cmdline_p) { - int dram_start; - console_verbose(); memory_start = memblock_start_of_DRAM(); |