Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

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

diff --cc Makefile
Simple merge

diff --cc arch/ia64/include/asm/kvm.h
index 116761ca462d88ff3236b725d15db3425b941a7d,bfa86b6af7cd0774d652c99d800e822284f74c23..2b0a38e847059fd18d995a01eff7ac178adda084
--- 1/arch/ia64/include/asm/kvm.h
--- 2/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@@ -21,9 -21,14 +21,13 @@@
   *
   */
  
 -#include <asm/types.h>
 -
 +#include <linux/types.h>
  #include <linux/ioctl.h>
  
+ /* Select x86 specific features in <linux/kvm.h> */
+ #define __KVM_HAVE_IOAPIC
+ #define __KVM_HAVE_DEVICE_ASSIGNMENT
+ 
  /* Architectural interrupt line count. */
  #define KVM_NR_INTERRUPTS 256
  

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_amd_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel_64.c
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/setup.c
index ebef80055795c3c3a6599e5d8ac802a67954f37d,c461f6d6907487cd60211e06b115ac1be76dd697..d699811b3f7c7ab83ec1110c0ff71318d4a4c875
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -985,128 -977,4 +985,128 @@@ void __init setup_arch(char **cmdline_p
  #endif
  }
  
-       .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL,
 +#ifdef CONFIG_X86_32
 +
 +/**
 + * pre_intr_init_hook - initialisation prior to setting up interrupt vectors
 + *
 + * Description:
 + *    Perform any necessary interrupt initialisation prior to setting up
 + *    the "ordinary" interrupt call gates.  For legacy reasons, the ISA
 + *    interrupts should be initialised here if the machine emulates a PC
 + *    in any way.
 + **/
 +void __init pre_intr_init_hook(void)
 +{
 +      if (x86_quirks->arch_pre_intr_init) {
 +              if (x86_quirks->arch_pre_intr_init())
 +                      return;
 +      }
 +      init_ISA_irqs();
 +}
 +
 +/**
 + * intr_init_hook - post gate setup interrupt initialisation
 + *
 + * Description:
 + *    Fill in any interrupts that may have been left out by the general
 + *    init_IRQ() routine.  interrupts having to do with the machine rather
 + *    than the devices on the I/O bus (like APIC interrupts in intel MP
 + *    systems) are started here.
 + **/
 +void __init intr_init_hook(void)
 +{
 +      if (x86_quirks->arch_intr_init) {
 +              if (x86_quirks->arch_intr_init())
 +                      return;
 +      }
 +}
 +
 +/**
 + * pre_setup_arch_hook - hook called prior to any setup_arch() execution
 + *
 + * Description:
 + *    generally used to activate any machine specific identification
 + *    routines that may be needed before setup_arch() runs.  On Voyager
 + *    this is used to get the board revision and type.
 + **/
 +void __init pre_setup_arch_hook(void)
 +{
 +}
 +
 +/**
 + * trap_init_hook - initialise system specific traps
 + *
 + * Description:
 + *    Called as the final act of trap_init().  Used in VISWS to initialise
 + *    the various board specific APIC traps.
 + **/
 +void __init trap_init_hook(void)
 +{
 +      if (x86_quirks->arch_trap_init) {
 +              if (x86_quirks->arch_trap_init())
 +                      return;
 +      }
 +}
 +
 +static struct irqaction irq0  = {
 +      .handler = timer_interrupt,
++      .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
 +      .mask = CPU_MASK_NONE,
 +      .name = "timer"
 +};
 +
 +/**
 + * pre_time_init_hook - do any specific initialisations before.
 + *
 + **/
 +void __init pre_time_init_hook(void)
 +{
 +      if (x86_quirks->arch_pre_time_init)
 +              x86_quirks->arch_pre_time_init();
 +}
 +
 +/**
 + * time_init_hook - do any specific initialisations for the system timer.
 + *
 + * Description:
 + *    Must plug the system timer interrupt source at HZ into the IRQ listed
 + *    in irq_vectors.h:TIMER_IRQ
 + **/
 +void __init time_init_hook(void)
 +{
 +      if (x86_quirks->arch_time_init) {
 +              /*
 +               * A nonzero return code does not mean failure, it means
 +               * that the architecture quirk does not want any
 +               * generic (timer) setup to be performed after this:
 +               */
 +              if (x86_quirks->arch_time_init())
 +                      return;
 +      }
 +
 +      irq0.mask = cpumask_of_cpu(0);
 +      setup_irq(0, &irq0);
 +}
 +
 +#ifdef CONFIG_MCA
 +/**
 + * mca_nmi_hook - hook into MCA specific NMI chain
 + *
 + * Description:
 + *    The MCA (Microchannel Architecture) has an NMI chain for NMI sources
 + *    along the MCA bus.  Use this to hook into that chain if you will need
 + *    it.
 + **/
 +void mca_nmi_hook(void)
 +{
 +      /*
 +       * If I recall correctly, there's a whole bunch of other things that
 +       * we can do to check for NMI problems, but that's all I know about
 +       * at the moment.
 +       */
 +      pr_warning("NMI generated from unknown source!\n");
 +}
 +#endif /* CONFIG_MCA */
  
 +#endif /* CONFIG_X86_32 */

diff --cc arch/x86/kernel/vmiclock_32.c
Simple merge

diff --cc arch/x86/mach-voyager/setup.c
Simple merge

diff --cc arch/x86/mm/numa_64.c
Simple merge

diff --cc drivers/xen/manage.c
Simple merge

diff --cc kernel/kexec.c
Simple merge

diff --cc kernel/sched.c
Simple merge