diff options
Diffstat (limited to 'arch/s390/kernel/sclp.S')
| -rw-r--r-- | arch/s390/kernel/sclp.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/s390/kernel/sclp.S b/arch/s390/kernel/sclp.S index bf053898630d..b6506ee32a36 100644 --- a/arch/s390/kernel/sclp.S +++ b/arch/s390/kernel/sclp.S | |||
| @@ -44,6 +44,12 @@ _sclp_wait_int: | |||
| 44 | #endif | 44 | #endif |
| 45 | mvc .LoldpswS1-.LbaseS1(16,%r13),0(%r8) | 45 | mvc .LoldpswS1-.LbaseS1(16,%r13),0(%r8) |
| 46 | mvc 0(16,%r8),0(%r9) | 46 | mvc 0(16,%r8),0(%r9) |
| 47 | #ifdef CONFIG_64BIT | ||
| 48 | epsw %r6,%r7 # set current addressing mode | ||
| 49 | nill %r6,0x1 # in new psw (31 or 64 bit mode) | ||
| 50 | nilh %r7,0x8000 | ||
| 51 | stm %r6,%r7,0(%r8) | ||
| 52 | #endif | ||
| 47 | lhi %r6,0x0200 # cr mask for ext int (cr0.54) | 53 | lhi %r6,0x0200 # cr mask for ext int (cr0.54) |
| 48 | ltr %r2,%r2 | 54 | ltr %r2,%r2 |
| 49 | jz .LsetctS1 | 55 | jz .LsetctS1 |
| @@ -87,7 +93,7 @@ _sclp_wait_int: | |||
| 87 | .long 0x00080000, 0x80000000+.LwaitS1 # PSW to handle ext int | 93 | .long 0x00080000, 0x80000000+.LwaitS1 # PSW to handle ext int |
| 88 | #ifdef CONFIG_64BIT | 94 | #ifdef CONFIG_64BIT |
| 89 | .LextpswS1_64: | 95 | .LextpswS1_64: |
| 90 | .quad 0x0000000180000000, .LwaitS1 # PSW to handle ext int, 64 bit | 96 | .quad 0, .LwaitS1 # PSW to handle ext int, 64 bit |
| 91 | #endif | 97 | #endif |
| 92 | .LwaitpswS1: | 98 | .LwaitpswS1: |
| 93 | .long 0x010a0000, 0x00000000+.LloopS1 # PSW to wait for ext int | 99 | .long 0x010a0000, 0x00000000+.LloopS1 # PSW to wait for ext int |