diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-26 13:27:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-26 13:27:00 -0400 |
| commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
| tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /arch/s390/kvm/sie64a.S | |
| parent | 43bc2db47292a824152145253b1dd2847e7312a3 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/s390/kvm/sie64a.S')
| -rw-r--r-- | arch/s390/kvm/sie64a.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/kvm/sie64a.S b/arch/s390/kvm/sie64a.S index 31646bd0e469..7e9d30d567b0 100644 --- a/arch/s390/kvm/sie64a.S +++ b/arch/s390/kvm/sie64a.S | |||
| @@ -32,12 +32,10 @@ SPI_PSW = STACK_FRAME_OVERHEAD + __PT_PSW | |||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | .macro SPP newpp | 34 | .macro SPP newpp |
| 35 | #ifdef CONFIG_KVM_AWARE_CMF | ||
| 36 | tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_SPP | 35 | tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_SPP |
| 37 | jz 0f | 36 | jz 0f |
| 38 | .insn s,0xb2800000,\newpp | 37 | .insn s,0xb2800000,\newpp |
| 39 | 0: | 38 | 0: |
| 40 | #endif | ||
| 41 | .endm | 39 | .endm |
| 42 | 40 | ||
| 43 | sie_irq_handler: | 41 | sie_irq_handler: |