From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed, 9 Dec 2009 06:14:38 +0000 (+1100)
Subject: Merge commit 'origin/master' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h
---

bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71
diff --cc arch/powerpc/kernel/exceptions-64s.S
index fc3ead066cec,c7eb4e0eb86c..e3be98ffe2a7
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@@ -190,16 -185,16 +190,19 @@@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE
  	 * prolog code of the PerformanceMonitor one. A little
  	 * trickery is thus necessary
  	 */
+ performance_monitor_pSeries_1:
  	. = 0xf00
 +	DO_KVM	0xf00
  	b	performance_monitor_pSeries
  
+ altivec_unavailable_pSeries_1:
  	. = 0xf20
 +	DO_KVM	0xf20
  	b	altivec_unavailable_pSeries
  
+ vsx_unavailable_pSeries_1:
  	. = 0xf40
 +	DO_KVM	0xf40
  	b	vsx_unavailable_pSeries
  
  #ifdef CONFIG_CBE_RAS
diff --cc include/linux/kvm.h
index caf6173bd2e8,2d241da07236..a24de0b1858e
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -436,9 -487,15 +487,16 @@@ struct kvm_ioeventfd 
  #endif
  #define KVM_CAP_IOEVENTFD 36
  #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
- /* KVM upstream has more features, but we synched this number.
-    Linux, please remove this comment on rebase. */
+ #ifdef __KVM_HAVE_XEN_HVM
+ #define KVM_CAP_XEN_HVM 38
+ #endif
+ #define KVM_CAP_ADJUST_CLOCK 39
+ #define KVM_CAP_INTERNAL_ERROR_DATA 40
+ #ifdef __KVM_HAVE_VCPU_EVENTS
+ #define KVM_CAP_VCPU_EVENTS 41
+ #endif
+ #define KVM_CAP_S390_PSW 42
 +#define KVM_CAP_PPC_SEGSTATE 43
  
  #ifdef KVM_CAP_IRQ_ROUTING