2 files changed, 11 insertions, 10 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 10382931eead..176f7e5136c7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1,5 +1,6 @@
 config DEFCONFIG_LIST
         string
+        depends on !UML
         option defconfig_list
         default "/lib/modules/$UNAME_RELEASE/.config"
         default "/etc/kernel-config"
@@ -303,20 +304,19 @@ config UID16
 
 config SYSCTL_SYSCALL
         bool "Sysctl syscall support" if EMBEDDED
-        default n
+        default y
         select SYSCTL
         ---help---
-          Enable the deprecated sysctl system call.  sys_sysctl uses
-          binary paths that have been found to be a major pain to maintain
-          and use.  The interface in /proc/sys is now the primary and what
-          everyone uses.
+          sys_sysctl uses binary paths that have been found challenging
+          to properly maintain and use.  The interface in /proc/sys
+          using paths with ascii names is now the primary path to this
+          information.
 
-          Nothing has been using the binary sysctl interface for some
-          time now so nothing should break if you disable sysctl syscall
-          support, and your kernel will get marginally smaller.
+          Almost nothing using the binary sysctl interface so if you are
+          trying to save some space it is probably safe to disable this,
+          making your kernel marginally smaller.
 
-          Unless you have an application that uses the sys_sysctl interface
-          you should probably say N here.
+          If unsure say Y here.
 
 config KALLSYMS
          bool "Load all symbols for debugging/kksymoops" if EMBEDDED
diff --git a/init/main.c b/init/main.c
index ee123243fb53..36f608a7cfba 100644
--- a/init/main.c
+++ b/init/main.c
@@ -503,6 +503,7 @@ asmlinkage void __init start_kernel(void)
         printk(KERN_NOTICE);
         printk(linux_banner);
         setup_arch(&command_line);
+        unwind_setup();
         setup_per_cpu_areas();
         smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */