git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
s390
/
kvm
/
sie64a.S
diff --git
a/arch/s390/kvm/sie64a.S
b/arch/s390/kvm/sie64a.S
index
31646bd
..
7e9d30d
100644
(file)
--- a/
arch/s390/kvm/sie64a.S
+++ b/
arch/s390/kvm/sie64a.S
@@
-32,12
+32,10
@@
SPI_PSW = STACK_FRAME_OVERHEAD + __PT_PSW
.macro SPP newpp
.macro SPP newpp
-#ifdef CONFIG_KVM_AWARE_CMF
tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_SPP
jz 0f
.insn s,0xb2800000,\newpp
tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_SPP
jz 0f
.insn s,0xb2800000,\newpp
- 0:
-#endif
+0:
.endm
sie_irq_handler:
.endm
sie_irq_handler: