diff options
Diffstat (limited to 'arch/s390/kernel/entry64.S')
-rw-r--r-- | arch/s390/kernel/entry64.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 6d34e0c97a39..9c837c101297 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -72,9 +72,9 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING) | |||
72 | #endif | 72 | #endif |
73 | .endm | 73 | .endm |
74 | 74 | ||
75 | .macro SPP newpp | 75 | .macro LPP newpp |
76 | #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) | 76 | #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE) |
77 | tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_SPP | 77 | tm __LC_MACHINE_FLAGS+6,0x20 # MACHINE_FLAG_LPP |
78 | jz .+8 | 78 | jz .+8 |
79 | .insn s,0xb2800000,\newpp | 79 | .insn s,0xb2800000,\newpp |
80 | #endif | 80 | #endif |
@@ -96,7 +96,7 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING) | |||
96 | jhe .+22 | 96 | jhe .+22 |
97 | .endif | 97 | .endif |
98 | lg %r9,BASED(.Lsie_loop) | 98 | lg %r9,BASED(.Lsie_loop) |
99 | SPP BASED(.Lhost_id) # set host id | 99 | LPP BASED(.Lhost_id) # set host id |
100 | #endif | 100 | #endif |
101 | .endm | 101 | .endm |
102 | 102 | ||
@@ -967,10 +967,10 @@ sie_loop: | |||
967 | lctlg %c1,%c1,__GMAP_ASCE(%r14) # load primary asce | 967 | lctlg %c1,%c1,__GMAP_ASCE(%r14) # load primary asce |
968 | sie_gmap: | 968 | sie_gmap: |
969 | lg %r14,__SF_EMPTY(%r15) # get control block pointer | 969 | lg %r14,__SF_EMPTY(%r15) # get control block pointer |
970 | SPP __SF_EMPTY(%r15) # set guest id | 970 | LPP __SF_EMPTY(%r15) # set guest id |
971 | sie 0(%r14) | 971 | sie 0(%r14) |
972 | sie_done: | 972 | sie_done: |
973 | SPP __SF_EMPTY+16(%r15) # set host id | 973 | LPP __SF_EMPTY+16(%r15) # set host id |
974 | lg %r14,__LC_THREAD_INFO # pointer thread_info struct | 974 | lg %r14,__LC_THREAD_INFO # pointer thread_info struct |
975 | sie_exit: | 975 | sie_exit: |
976 | lctlg %c1,%c1,__LC_USER_ASCE # load primary asce | 976 | lctlg %c1,%c1,__LC_USER_ASCE # load primary asce |