2.6.25-rc7

 init

diff --git a/init/main.c b/init/main.c
index 80b04b6..99ce949 100644
--- a/init/main.c
+++ b/init/main.c
@@ -57,6 +57,7 @@
 #include <linux/device.h>
 #include <linux/kthread.h>
 #include <linux/sched.h>
+#include <linux/signal.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -83,7 +84,6 @@ extern void init_IRQ(void);
 extern void fork_init(unsigned long);
 extern void mca_init(void);
 extern void sbus_init(void);
-extern void signals_init(void);
 extern void pidhash_init(void);
 extern void pidmap_init(void);
 extern void prio_tree_init(void);
@@ -128,7 +128,7 @@ static char *ramdisk_execute_command;
 
 #ifdef CONFIG_SMP
 /* Setup configured maximum number of CPUs to activate */
-static unsigned int __initdata max_cpus = NR_CPUS;
+unsigned int __initdata setup_max_cpus = NR_CPUS;
 
 /*
  * Setup routine for controlling SMP activation
@@ -146,7 +146,7 @@ static inline void disable_ioapic_setup(void) {};
 
 static int __init nosmp(char *str)
 {
-   max_cpus = 0;
+   setup_max_cpus = 0;
    disable_ioapic_setup();
    return 0;
 }
@@ -155,8 +155,8 @@ early_param("nosmp", nosmp);
 
 static int __init maxcpus(char *str)
 {
-   get_option(&str, &max_cpus);
-   if (max_cpus == 0)
+   get_option(&str, &setup_max_cpus);
+   if (setup_max_cpus == 0)
       disable_ioapic_setup();
 
    return 0;
@@ -164,7 +164,7 @@ static int __init maxcpus(char *str)
 
 early_param("maxcpus", maxcpus);
 #else
-#define max_cpus NR_CPUS
+#define setup_max_cpus NR_CPUS
 #endif
 
 /*
@@ -232,30 +232,26 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-   if (*str)
-      return 0;
    console_loglevel = 10;
-   return 1;
+   return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-   if (*str)
-      return 0;
    console_loglevel = 4;
-   return 1;
+   return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
    get_option(&str, &console_loglevel);
-   return 1;
+   return 0;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
@@ -318,6 +314,10 @@ static int __init unknown_bootoption(char *param, char *val)
    return 0;
 }
 
+#ifdef CONFIG_DEBUG_PAGEALLOC
+int __read_mostly debug_pagealloc_enabled = 0;
+#endif
+
 static int __init init_setup(char *str)
 {
    unsigned int i;
@@ -363,7 +363,7 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 
 #else
 
-#ifdef __GENERIC_PER_CPU
+#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
 unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
 
 EXPORT_SYMBOL(__per_cpu_offset);
@@ -384,7 +384,7 @@ static void __init setup_per_cpu_areas(void)
       ptr += size;
    }
 }
-#endif /* !__GENERIC_PER_CPU */
+#endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
 
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)
@@ -393,7 +393,7 @@ static void __init smp_init(void)
 
    /* FIXME: This should be done in userspace --RR */
    for_each_present_cpu(cpu) {
-      if (num_online_cpus() >= max_cpus)
+      if (num_online_cpus() >= setup_max_cpus)
          break;
       if (!cpu_online(cpu))
          cpu_up(cpu);
@@ -401,7 +401,7 @@ static void __init smp_init(void)
 
    /* Any cleanup work */
    printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
-   smp_cpus_done(max_cpus);
+   smp_cpus_done(setup_max_cpus);
 }
 
 #endif
@@ -607,6 +607,8 @@ 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();
    numa_policy_init();
@@ -820,10 +822,9 @@ static int __init kernel_init(void * unused)
     */
    init_pid_ns.child_reaper = current;
 
-   __set_special_pids(1, 1);
    cad_pid = task_pid(current);
 
-   smp_prepare_cpus(max_cpus);
+   smp_prepare_cpus(setup_max_cpus);
 
    do_pre_smp_initcalls();