From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 14 Aug 2008 12:58:01 +0000 (+0200)
Subject: Merge branch 'linus' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2~1^2~33^2~3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=51ca3c679194e7435c25b8e77b0a73c597e41ae9;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/core

Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

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

51ca3c679194e7435c25b8e77b0a73c597e41ae9
diff --cc arch/x86/kernel/io_apic_64.c
index b9950dae59b,61a83b70c18..e63282e7886
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@@ -898,18 -838,7 +911,10 @@@ void __setup_vector_irq(int cpu
  	}
  }
  
- void setup_vector_irq(int cpu)
- {
- 	spin_lock(&vector_lock);
- 	__setup_vector_irq(smp_processor_id());
- 	spin_unlock(&vector_lock);
- }
- 
- 
  static struct irq_chip ioapic_chip;
 +#ifdef CONFIG_INTR_REMAP
 +static struct irq_chip ir_ioapic_chip;
 +#endif
  
  static void ioapic_register_intr(int irq, unsigned long trigger)
  {
diff --cc include/asm-x86/kvm_host.h
index 95eb742765b,0f3c5311461..72e9a525f91
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@@ -729,4 -731,8 +731,8 @@@ asmlinkage void kvm_handle_fault_on_reb
  	KVM_EX_ENTRY " 666b, 667b \n\t" \
  	".popsection"
  
+ #define KVM_ARCH_WANT_MMU_NOTIFIER
+ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
+ int kvm_age_hva(struct kvm *kvm, unsigned long hva);
+ 
 -#endif
 +#endif /* ASM_X86__KVM_HOST_H */