diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 6 | ||||
-rw-r--r-- | init/main.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index f3f7e41c32fd..cc93c44dc9ff 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -65,8 +65,7 @@ config CROSS_COMPILE config COMPILE_TEST bool "Compile also drivers which will not load" - depends on !UML - default n + depends on HAS_IOMEM help Some drivers can be compiled on a different platform than they are intended to be run on. Despite they cannot be loaded there (or even @@ -500,7 +499,8 @@ config IKCONFIG_PROC config LOG_BUF_SHIFT int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" - range 12 25 + range 12 25 if !H8300 + range 12 19 if H8300 default 17 depends on PRINTK help diff --git a/init/main.c b/init/main.c index ae6225c0c187..09f56fdf5324 100644 --- a/init/main.c +++ b/init/main.c @@ -1055,7 +1055,7 @@ static noinline void __init kernel_init_freeable(void) */ set_mems_allowed(node_states[N_MEMORY]); - cad_pid = task_pid(current); + cad_pid = get_pid(task_pid(current)); smp_prepare_cpus(setup_max_cpus); |