From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 May 2014 04:23:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20140506~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cf148fda1fa7d71b737e38d6d388496baaf1e82;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm/linux-next'
---

8cf148fda1fa7d71b737e38d6d388496baaf1e82
diff --cc arch/s390/kernel/entry.S
index 18e5af848f9a,e66f046b9c43..70203265196f
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@@ -387,10 -389,10 +387,10 @@@ ENTRY(pgm_check_handler
  	l	%r1,__TI_task(%r12)
  	tmh	%r8,0x0001		# kernel per event ?
  	jz	pgm_kprobe
 -	oi	__TI_flags+3(%r12),_TIF_PER_TRAP
 +	oi	__PT_FLAGS+3(%r11),_PIF_PER_TRAP
  	mvc	__THREAD_per_address(4,%r1),__LC_PER_ADDRESS
- 	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CAUSE
- 	mvc	__THREAD_per_paid(1,%r1),__LC_PER_PAID
+ 	mvc	__THREAD_per_cause(2,%r1),__LC_PER_CODE
+ 	mvc	__THREAD_per_paid(1,%r1),__LC_PER_ACCESS_ID
  0:	REENABLE_IRQS
  	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
  	l	%r1,BASED(.Ljump_table)
diff --cc arch/s390/kernel/entry64.S
index c41f3f906720,3c34753de6ad..f2e674c702e1
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@@ -418,10 -421,10 +418,10 @@@ ENTRY(pgm_check_handler
  	jz	0f
  	tmhh	%r8,0x0001		# kernel per event ?
  	jz	pgm_kprobe
 -	oi	__TI_flags+7(%r12),_TIF_PER_TRAP
 +	oi	__PT_FLAGS+7(%r11),_PIF_PER_TRAP
  	mvc	__THREAD_per_address(8,%r14),__LC_PER_ADDRESS
- 	mvc	__THREAD_per_cause(2,%r14),__LC_PER_CAUSE
- 	mvc	__THREAD_per_paid(1,%r14),__LC_PER_PAID
+ 	mvc	__THREAD_per_cause(2,%r14),__LC_PER_CODE
+ 	mvc	__THREAD_per_paid(1,%r14),__LC_PER_ACCESS_ID
  0:	REENABLE_IRQS
  	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
  	larl	%r1,pgm_check_table