diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-01-18 07:12:19 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-01-19 06:14:03 -0500 |
commit | 9cb1ccecb69d133e014b7be4de2609f689398c07 (patch) | |
tree | 1f1c79f80ad49efc0de749b4d8bc88a9135cd1da /arch/s390/mm | |
parent | fecc868a668774b0fc666728c3f5d9f6fceefe64 (diff) |
s390: remove all usages of PSW_ADDR_INSN
Yet another leftover from the 31 bit era. The usual operation
"y = x & PSW_ADDR_INSN" with the PSW_ADDR_INSN mask is a nop for
CONFIG_64BIT.
Therefore remove all usages and hope the code is a bit less confusing.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Diffstat (limited to 'arch/s390/mm')
-rw-r--r-- | arch/s390/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 95ed8d48f54e..791a4146052c 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
@@ -228,7 +228,7 @@ static inline void report_user_fault(struct pt_regs *regs, long signr) | |||
228 | return; | 228 | return; |
229 | printk(KERN_ALERT "User process fault: interruption code %04x ilc:%d ", | 229 | printk(KERN_ALERT "User process fault: interruption code %04x ilc:%d ", |
230 | regs->int_code & 0xffff, regs->int_code >> 17); | 230 | regs->int_code & 0xffff, regs->int_code >> 17); |
231 | print_vma_addr(KERN_CONT "in ", regs->psw.addr & PSW_ADDR_INSN); | 231 | print_vma_addr(KERN_CONT "in ", regs->psw.addr); |
232 | printk(KERN_CONT "\n"); | 232 | printk(KERN_CONT "\n"); |
233 | printk(KERN_ALERT "failing address: %016lx TEID: %016lx\n", | 233 | printk(KERN_ALERT "failing address: %016lx TEID: %016lx\n", |
234 | regs->int_parm_long & __FAIL_ADDR_MASK, regs->int_parm_long); | 234 | regs->int_parm_long & __FAIL_ADDR_MASK, regs->int_parm_long); |
@@ -256,7 +256,7 @@ static noinline void do_no_context(struct pt_regs *regs) | |||
256 | const struct exception_table_entry *fixup; | 256 | const struct exception_table_entry *fixup; |
257 | 257 | ||
258 | /* Are we prepared to handle this kernel fault? */ | 258 | /* Are we prepared to handle this kernel fault? */ |
259 | fixup = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN); | 259 | fixup = search_exception_tables(regs->psw.addr); |
260 | if (fixup) { | 260 | if (fixup) { |
261 | regs->psw.addr = extable_fixup(fixup); | 261 | regs->psw.addr = extable_fixup(fixup); |
262 | return; | 262 | return; |