diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-19 13:46:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-19 13:46:48 -0700 |
| commit | baa06775e224e9f74e5c2de894c95cd49678beff (patch) | |
| tree | 75f06a56bcb8e82e0a820d33cceb20ec74a18d23 /arch/sparc | |
| parent | 6c94b1ee0ca2bfb526d779c088ec20da6a3761db (diff) | |
| download | linux-3.10-baa06775e224e9f74e5c2de894c95cd49678beff.tar.gz linux-3.10-baa06775e224e9f74e5c2de894c95cd49678beff.tar.bz2 linux-3.10-baa06775e224e9f74e5c2de894c95cd49678beff.zip | |
sparc64: Use correct pt_regs in decode_access_size() error paths.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/unaligned_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c index ebce43018c4..c752c4c479b 100644 --- a/arch/sparc/kernel/unaligned_64.c +++ b/arch/sparc/kernel/unaligned_64.c @@ -50,7 +50,7 @@ static inline enum direction decode_direction(unsigned int insn) } /* 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; @@ -66,7 +66,7 @@ static inline int decode_access_size(unsigned int insn) return 2; else { 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 * of this function without returning a value because @@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs) asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) { enum direction dir = decode_direction(insn); - int size = decode_access_size(insn); + int size = decode_access_size(regs, insn); int orig_asi, asi; current_thread_info()->kern_una_regs = regs; |