2 files changed, 18 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f70f2fd273c2..a5b073a103e7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -54,8 +54,8 @@ config LOCK_KERNEL
 
 config INIT_ENV_ARG_LIMIT
         int
-        default 32 if !USERMODE
-        default 128 if USERMODE
+        default 32 if !UML
+        default 128 if UML
         help
           Maximum of each of the number of arguments and environment
           variables passed to init from the kernel command line.
@@ -379,6 +379,15 @@ config SLAB
           SLOB is more space efficient but does not scale well and is
           more susceptible to fragmentation.
 
+config VM_EVENT_COUNTERS
+        default y
+        bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
+        help
+          VM event counters are only needed to for event counts to be
+          shown. They have no function for the kernel itself. This
+          option allows the disabling of the VM event counters.
+          /proc/vmstat will only show page counts.
+
 endmenu         # General setup
 
 config TINY_SHMEM
diff --git a/init/main.c b/init/main.c
index edff815744eb..b2f3b566790e 100644
--- a/init/main.c
+++ b/init/main.c
@@ -445,10 +445,17 @@ static void __init boot_cpu_init(void)
         cpu_set(cpu, cpu_possible_map);
 }
 
+void __init __attribute__((weak)) smp_setup_processor_id(void)
+{
+}
+
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
         extern struct kernel_param __start___param[], __stop___param[];
+
+        smp_setup_processor_id();
+
 /*
  * Interrupts are still disabled. Do necessary setups, then
  * enable them