diff options
-rw-r--r-- | arch/s390/include/asm/lowcore.h | 4 | ||||
-rw-r--r-- | arch/s390/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/s390/kernel/entry64.S | 2 | ||||
-rw-r--r-- | arch/s390/kernel/swsusp_asm64.S | 4 | ||||
-rw-r--r-- | arch/s390/kvm/interrupt.c | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h index 707f2306725b..0831449e87a3 100644 --- a/arch/s390/include/asm/lowcore.h +++ b/arch/s390/include/asm/lowcore.h | |||
@@ -56,7 +56,7 @@ struct _lowcore { | |||
56 | psw_t mcck_new_psw; /* 0x0070 */ | 56 | psw_t mcck_new_psw; /* 0x0070 */ |
57 | psw_t io_new_psw; /* 0x0078 */ | 57 | psw_t io_new_psw; /* 0x0078 */ |
58 | __u32 ext_params; /* 0x0080 */ | 58 | __u32 ext_params; /* 0x0080 */ |
59 | __u16 cpu_addr; /* 0x0084 */ | 59 | __u16 ext_cpu_addr; /* 0x0084 */ |
60 | __u16 ext_int_code; /* 0x0086 */ | 60 | __u16 ext_int_code; /* 0x0086 */ |
61 | __u16 svc_ilc; /* 0x0088 */ | 61 | __u16 svc_ilc; /* 0x0088 */ |
62 | __u16 svc_code; /* 0x008a */ | 62 | __u16 svc_code; /* 0x008a */ |
@@ -189,7 +189,7 @@ struct _lowcore { | |||
189 | __u32 ipl_parmblock_ptr; /* 0x0014 */ | 189 | __u32 ipl_parmblock_ptr; /* 0x0014 */ |
190 | __u8 pad_0x0018[0x0080-0x0018]; /* 0x0018 */ | 190 | __u8 pad_0x0018[0x0080-0x0018]; /* 0x0018 */ |
191 | __u32 ext_params; /* 0x0080 */ | 191 | __u32 ext_params; /* 0x0080 */ |
192 | __u16 cpu_addr; /* 0x0084 */ | 192 | __u16 ext_cpu_addr; /* 0x0084 */ |
193 | __u16 ext_int_code; /* 0x0086 */ | 193 | __u16 ext_int_code; /* 0x0086 */ |
194 | __u16 svc_ilc; /* 0x0088 */ | 194 | __u16 svc_ilc; /* 0x0088 */ |
195 | __u16 svc_code; /* 0x008a */ | 195 | __u16 svc_code; /* 0x008a */ |
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index 6e6a72e66d60..530ae0e8e38f 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c | |||
@@ -78,7 +78,7 @@ int main(void) | |||
78 | BLANK(); | 78 | BLANK(); |
79 | /* lowcore offsets */ | 79 | /* lowcore offsets */ |
80 | DEFINE(__LC_EXT_PARAMS, offsetof(struct _lowcore, ext_params)); | 80 | DEFINE(__LC_EXT_PARAMS, offsetof(struct _lowcore, ext_params)); |
81 | DEFINE(__LC_CPU_ADDRESS, offsetof(struct _lowcore, cpu_addr)); | 81 | DEFINE(__LC_EXT_CPU_ADDR, offsetof(struct _lowcore, ext_cpu_addr)); |
82 | DEFINE(__LC_EXT_INT_CODE, offsetof(struct _lowcore, ext_int_code)); | 82 | DEFINE(__LC_EXT_INT_CODE, offsetof(struct _lowcore, ext_int_code)); |
83 | DEFINE(__LC_SVC_ILC, offsetof(struct _lowcore, svc_ilc)); | 83 | DEFINE(__LC_SVC_ILC, offsetof(struct _lowcore, svc_ilc)); |
84 | DEFINE(__LC_SVC_INT_CODE, offsetof(struct _lowcore, svc_code)); | 84 | DEFINE(__LC_SVC_INT_CODE, offsetof(struct _lowcore, svc_code)); |
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index 3705700ed374..5f437b830da5 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -606,7 +606,7 @@ ext_skip: | |||
606 | stm %r8,%r9,__PT_PSW(%r11) | 606 | stm %r8,%r9,__PT_PSW(%r11) |
607 | TRACE_IRQS_OFF | 607 | TRACE_IRQS_OFF |
608 | lr %r2,%r11 # pass pointer to pt_regs | 608 | lr %r2,%r11 # pass pointer to pt_regs |
609 | l %r3,__LC_CPU_ADDRESS # get cpu address + interruption code | 609 | l %r3,__LC_EXT_CPU_ADDR # get cpu address + interruption code |
610 | l %r4,__LC_EXT_PARAMS # get external parameters | 610 | l %r4,__LC_EXT_PARAMS # get external parameters |
611 | l %r1,BASED(.Ldo_extint) | 611 | l %r1,BASED(.Ldo_extint) |
612 | basr %r14,%r1 # call do_extint | 612 | basr %r14,%r1 # call do_extint |
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 412a7b8783d7..bacbd2848d40 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -625,7 +625,7 @@ ext_skip: | |||
625 | TRACE_IRQS_OFF | 625 | TRACE_IRQS_OFF |
626 | lghi %r1,4096 | 626 | lghi %r1,4096 |
627 | lgr %r2,%r11 # pass pointer to pt_regs | 627 | lgr %r2,%r11 # pass pointer to pt_regs |
628 | llgf %r3,__LC_CPU_ADDRESS # get cpu address + interruption code | 628 | llgf %r3,__LC_EXT_CPU_ADDR # get cpu address + interruption code |
629 | llgf %r4,__LC_EXT_PARAMS # get external parameter | 629 | llgf %r4,__LC_EXT_PARAMS # get external parameter |
630 | lg %r5,__LC_EXT_PARAMS2-4096(%r1) # get 64 bit external parameter | 630 | lg %r5,__LC_EXT_PARAMS2-4096(%r1) # get 64 bit external parameter |
631 | brasl %r14,do_extint | 631 | brasl %r14,do_extint |
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index acb78cdee896..2ef39d1519a9 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
@@ -42,7 +42,7 @@ ENTRY(swsusp_arch_suspend) | |||
42 | lghi %r1,0x1000 | 42 | lghi %r1,0x1000 |
43 | 43 | ||
44 | /* Save CPU address */ | 44 | /* Save CPU address */ |
45 | stap __LC_CPU_ADDRESS(%r0) | 45 | stap __LC_EXT_CPU_ADDR(%r0) |
46 | 46 | ||
47 | /* Store registers */ | 47 | /* Store registers */ |
48 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ | 48 | mvc 0x318(4,%r1),__SF_EMPTY(%r15) /* move prefix to lowcore */ |
@@ -173,7 +173,7 @@ pgm_check_entry: | |||
173 | larl %r1,.Lresume_cpu /* Resume CPU address: r2 */ | 173 | larl %r1,.Lresume_cpu /* Resume CPU address: r2 */ |
174 | stap 0(%r1) | 174 | stap 0(%r1) |
175 | llgh %r2,0(%r1) | 175 | llgh %r2,0(%r1) |
176 | llgh %r1,__LC_CPU_ADDRESS(%r0) /* Suspend CPU address: r1 */ | 176 | llgh %r1,__LC_EXT_CPU_ADDR(%r0) /* Suspend CPU address: r1 */ |
177 | cgr %r1,%r2 | 177 | cgr %r1,%r2 |
178 | je restore_registers /* r1 = r2 -> nothing to do */ | 178 | je restore_registers /* r1 = r2 -> nothing to do */ |
179 | larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ | 179 | larl %r4,.Lrestart_suspend_psw /* Set new restart PSW */ |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 278ee009ce65..f0647ce6da21 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -134,7 +134,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
134 | if (rc == -EFAULT) | 134 | if (rc == -EFAULT) |
135 | exception = 1; | 135 | exception = 1; |
136 | 136 | ||
137 | rc = put_guest_u16(vcpu, __LC_CPU_ADDRESS, inti->emerg.code); | 137 | rc = put_guest_u16(vcpu, __LC_EXT_CPU_ADDR, inti->emerg.code); |
138 | if (rc == -EFAULT) | 138 | if (rc == -EFAULT) |
139 | exception = 1; | 139 | exception = 1; |
140 | 140 | ||
@@ -156,7 +156,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
156 | if (rc == -EFAULT) | 156 | if (rc == -EFAULT) |
157 | exception = 1; | 157 | exception = 1; |
158 | 158 | ||
159 | rc = put_guest_u16(vcpu, __LC_CPU_ADDRESS, inti->extcall.code); | 159 | rc = put_guest_u16(vcpu, __LC_EXT_CPU_ADDR, inti->extcall.code); |
160 | if (rc == -EFAULT) | 160 | if (rc == -EFAULT) |
161 | exception = 1; | 161 | exception = 1; |
162 | 162 | ||
@@ -202,7 +202,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
202 | if (rc == -EFAULT) | 202 | if (rc == -EFAULT) |
203 | exception = 1; | 203 | exception = 1; |
204 | 204 | ||
205 | rc = put_guest_u16(vcpu, __LC_CPU_ADDRESS, 0x0d00); | 205 | rc = put_guest_u16(vcpu, __LC_EXT_CPU_ADDR, 0x0d00); |
206 | if (rc == -EFAULT) | 206 | if (rc == -EFAULT) |
207 | exception = 1; | 207 | exception = 1; |
208 | 208 | ||