Commit baa06775 authored by David S. Miller's avatar David S. Miller

sparc64: Use correct pt_regs in decode_access_size() error paths.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c94b1ee
...@@ -50,7 +50,7 @@ static inline enum direction decode_direction(unsigned int insn) ...@@ -50,7 +50,7 @@ static inline enum direction decode_direction(unsigned int insn)
} }
/* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */ /* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */
static inline int decode_access_size(unsigned int insn) static inline int decode_access_size(struct pt_regs *regs, unsigned int insn)
{ {
unsigned int tmp; unsigned int tmp;
...@@ -66,7 +66,7 @@ static inline int decode_access_size(unsigned int insn) ...@@ -66,7 +66,7 @@ static inline int decode_access_size(unsigned int insn)
return 2; return 2;
else { else {
printk("Impossible unaligned trap. insn=%08x\n", insn); printk("Impossible unaligned trap. insn=%08x\n", insn);
die_if_kernel("Byte sized unaligned access?!?!", current_thread_info()->kregs); die_if_kernel("Byte sized unaligned access?!?!", regs);
/* GCC should never warn that control reaches the end /* GCC should never warn that control reaches the end
* of this function without returning a value because * of this function without returning a value because
...@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs) ...@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
{ {
enum direction dir = decode_direction(insn); enum direction dir = decode_direction(insn);
int size = decode_access_size(insn); int size = decode_access_size(regs, insn);
int orig_asi, asi; int orig_asi, asi;
current_thread_info()->kern_una_regs = regs; current_thread_info()->kern_una_regs = regs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment