Merge commit 'v2.6.37-rc7' into perf/core
Ingo Molnar [Wed, 22 Dec 2010 10:53:20 +0000 (11:53 +0100)]
Merge reason: Pick up the latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
include/linux/sched.h
kernel/sched.c

Simple merge
diff --cc MAINTAINERS
Simple merge
@@@ -1382,7 -1387,16 +1382,15 @@@ void __cpuinit end_local_APIC_setup(voi
        }
  #endif
  
 -      setup_apic_nmi_watchdog(NULL);
        apic_pm_activate();
+       /*
+        * Now that local APIC setup is completed for BP, configure the fault
+        * handling for interrupt remapping.
+        */
+       if (!smp_processor_id() && intr_remapping_enabled)
+               enable_drhd_fault_handling();
  }
  
  #ifdef CONFIG_X86_X2APIC
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge