Merge branch 'x86/urgent' into x86/core
Ingo Molnar [Fri, 20 Feb 2009 16:40:43 +0000 (17:40 +0100)]
1  2 
Makefile
arch/ia64/include/asm/kvm.h
arch/x86/Kconfig.debug
arch/x86/kernel/apic/apic.c
arch/x86/kernel/process_32.c
arch/x86/kernel/vmiclock_32.c
arch/x86/mm/numa_64.c
kernel/sched.c

diff --cc Makefile
Simple merge
   *
   */
  
 -#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
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge