diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 | ||||
| -rw-r--r-- | init/Makefile | 4 | ||||
| -rw-r--r-- | init/main.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 455170e1c1e3..824d48cb67bf 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -587,7 +587,7 @@ config COMPAT_BRK disabled, and can be overriden runtime by setting /proc/sys/kernel/randomize_va_space to 2. - On non-ancient distros (post-2000 ones) Y is usually a safe choice. + On non-ancient distros (post-2000 ones) N is usually a safe choice. config BASE_FULL default y diff --git a/init/Makefile b/init/Makefile index 633392f5cdee..c5f157ce293e 100644 --- a/init/Makefile +++ b/init/Makefile @@ -27,7 +27,9 @@ $(obj)/version.o: include/linux/compile.h # mkcompile_h will make sure to only update the # actual file if its content has changed. + quiet_chk_compile.h = echo ' CHK $@' +silent_chk_compile.h = : include/linux/compile.h: FORCE - @echo ' CHK $@' + @$($(quiet)chk_compile.h) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" diff --git a/init/main.c b/init/main.c index c59859b85db0..8b1982082ad8 100644 --- a/init/main.c +++ b/init/main.c @@ -558,7 +558,6 @@ asmlinkage void __init start_kernel(void) preempt_disable(); build_all_zonelists(); page_alloc_init(); - enable_debug_pagealloc(); printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line); parse_early_param(); parse_args("Booting kernel", static_command_line, __start___param, @@ -614,6 +613,7 @@ asmlinkage void __init start_kernel(void) vfs_caches_init_early(); cpuset_init_early(); mem_init(); + enable_debug_pagealloc(); cpu_hotplug_init(); kmem_cache_init(); setup_per_cpu_pageset(); |