From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 22 Feb 2009 19:05:19 +0000 (+0100)
Subject: Merge branch 'linus' into x86/apic
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=fc6fc7f1b1095b92d4834e69b385b91e412a7ce5;p=linux-2.6-omap-h63xx.git

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>
---

fc6fc7f1b1095b92d4834e69b385b91e412a7ce5
diff --cc arch/ia64/include/asm/kvm.h
index 116761ca462,bfa86b6af7c..2b0a38e8470
--- a/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/kernel/setup.c
index ebef8005579,c461f6d6907..d699811b3f7
--- a/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
  }
  
 +#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,
++	.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 */