Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/numaq

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc arch/i386/Kconfig
Simple merge

diff --cc arch/i386/kernel/smpboot.c
index 1330f0d33bf75a67dfacbc4310093e994c9cf7a2,2ae47acb4338962957a1ad9f7049a38653c88910..c393236ad8e5f221429f67d65b46a2a09f1c498a
--- 1/arch/i386/kernel/smpboot.c
--- 2/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@@ -905,13 -881,9 +882,9 @@@ static int __init do_boot_cpu(int apici
        }
  
        /* mark "stuck" area as not stuck */
 -      *((volatile unsigned long *)phys_to_virt(8192)) = 0;
 +      *((volatile unsigned long *)trampoline_base) = 0;
  
-       if(clustered_apic_mode) {
-               printk("Restoring NMI vector\n");
-               *((volatile unsigned short *) TRAMPOLINE_HIGH) = nmi_high;
-               *((volatile unsigned short *) TRAMPOLINE_LOW) = nmi_low;
-       }
+       return boot_error;
  }
  
  cycles_t cacheflush_time;