Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (94 commits)
  [PATCH] x86-64: Remove mk_pte_phys()
  [PATCH] i386: Fix broken CONFIG_COMPAT_VDSO on i386
  [PATCH] i386: fix 32-bit ioctls on x64_32
  [PATCH] x86: Unify pcspeaker platform device code between i386/x86-64
  [PATCH] i386: Remove extern declaration from mm/discontig.c, put in header.
  [PATCH] i386: Rename cpu_gdt_descr and remove extern declaration from smpboot.c
  [PATCH] i386: Move mce_disabled to asm/mce.h
  [PATCH] i386: paravirt unhandled fallthrough
  [PATCH] x86_64: Wire up compat epoll_pwait
  [PATCH] x86: Don't require the vDSO for handling a.out signals
  [PATCH] i386: Fix Cyrix MediaGX detection
  [PATCH] i386: Fix warning in cpu initialization
  [PATCH] i386: Fix warning in microcode.c
  [PATCH] x86: Enable NMI watchdog for AMD Family 0x10 CPUs
  [PATCH] x86: Add new CPUID bits for AMD Family 10 CPUs in /proc/cpuinfo
  [PATCH] i386: Remove fastcall in paravirt.[ch]
  [PATCH] x86-64: Fix wrong gcc check in bitops.h
  [PATCH] x86-64: survive having no irq mapping for a vector
  [PATCH] i386: geode configuration fixes
  [PATCH] i386: add option to show more code in oops reports
  ...

diff --combined MAINTAINERS
index 9e6c9ff,011dd1d..b0fd71b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -620,11 -620,6 +620,11 @@@ P:       Haavard Skinnemoe
  M:    hskinnemoen@atmel.com
  S:    Supported
  
 +ATMEL SPI DRIVER
 +P:    Haavard Skinnemoen
 +M:    hskinnemoen@atmel.com
 +S:    Supported
 +
  ATMEL WIRELESS DRIVER
  P:    Simon Kelley
  M:    simon@thekelleys.org.uk
@@@ -2528,12 -2523,6 +2528,12 @@@ M:    olof@lixom.ne
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +PA SEMI SMBUS DRIVER
 +P:    Olof Johansson
 +M:    olof@lixom.net
 +L:    i2c@lm-sensors.org
 +S:    Maintained
 +
  PARALLEL PORT SUPPORT
  P:    Phil Blundell
  M:    philb@gnu.org
@@@ -3779,6 -3768,7 +3779,7 @@@ P:      Andi Klee
  M:    ak@suse.de
  L:    discuss@x86-64.org
  W:    http://www.x86-64.org
+ T:    quilt ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt-current
  S:    Maintained
  
  YAM DRIVER FOR AX.25

diff --combined init/main.c
index 649ab54,62ded9f..2421e15
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -86,6 -86,7 +86,6 @@@ extern void init_IRQ(void)
  extern void fork_init(unsigned long);
  extern void mca_init(void);
  extern void sbus_init(void);
 -extern void sysctl_init(void);
  extern void signals_init(void);
  extern void pidhash_init(void);
  extern void pidmap_init(void);
@@@ -701,8 -702,8 +701,8 @@@ static void __init do_basic_setup(void
        usermodehelper_init();
        driver_init();
  
 -#ifdef CONFIG_SYSCTL
 -      sysctl_init();
 +#ifdef CONFIG_PROC_FS
 +      init_irq_proc();
  #endif
  
        do_initcalls();
@@@ -726,7 -727,49 +726,49 @@@ static void run_init_process(char *init
        kernel_execve(init_filename, argv_init, envp_init);
  }
  
- static int init(void * unused)
+ /* This is a non __init function. Force it to be noinline otherwise gcc
+  * makes it inline to init() and it becomes part of init.text section
+  */
+ static int noinline init_post(void)
+ {
+       free_initmem();
+       unlock_kernel();
+       mark_rodata_ro();
+       system_state = SYSTEM_RUNNING;
+       numa_default_policy();
+ 
+       if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+               printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+ 
+       (void) sys_dup(0);
+       (void) sys_dup(0);
+ 
+       if (ramdisk_execute_command) {
+               run_init_process(ramdisk_execute_command);
+               printk(KERN_WARNING "Failed to execute %s\n",
+                               ramdisk_execute_command);
+       }
+ 
+       /*
+        * We try each of these until one succeeds.
+        *
+        * The Bourne shell can be used instead of init if we are
+        * trying to recover a really broken machine.
+        */
+       if (execute_command) {
+               run_init_process(execute_command);
+               printk(KERN_WARNING "Failed to execute %s.  Attempting "
+                                       "defaults...\n", execute_command);
+       }
+       run_init_process("/sbin/init");
+       run_init_process("/etc/init");
+       run_init_process("/bin/init");
+       run_init_process("/bin/sh");
+ 
+       panic("No init found.  Try passing init= option to kernel.");
+ }
+ 
+ static int __init init(void * unused)
  {
        lock_kernel();
        /*
@@@ -774,39 -817,6 +816,6 @@@
         * we're essentially up and running. Get rid of the
         * initmem segments and start the user-mode stuff..
         */
-       free_initmem();
-       unlock_kernel();
-       mark_rodata_ro();
-       system_state = SYSTEM_RUNNING;
-       numa_default_policy();
- 
-       if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-               printk(KERN_WARNING "Warning: unable to open an initial console.\n");
- 
-       (void) sys_dup(0);
-       (void) sys_dup(0);
- 
-       if (ramdisk_execute_command) {
-               run_init_process(ramdisk_execute_command);
-               printk(KERN_WARNING "Failed to execute %s\n",
-                               ramdisk_execute_command);
-       }
- 
-       /*
-        * We try each of these until one succeeds.
-        *
-        * The Bourne shell can be used instead of init if we are 
-        * trying to recover a really broken machine.
-        */
-       if (execute_command) {
-               run_init_process(execute_command);
-               printk(KERN_WARNING "Failed to execute %s.  Attempting "
-                                       "defaults...\n", execute_command);
-       }
-       run_init_process("/sbin/init");
-       run_init_process("/etc/init");
-       run_init_process("/bin/init");
-       run_init_process("/bin/sh");
- 
-       panic("No init found.  Try passing init= option to kernel.");
+       init_post();
+       return 0;
  }