diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-19 16:46:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 18:03:02 -0400 |
commit | cef0d77411b68ff897c9dc8370394baee004bbe2 (patch) | |
tree | 445885078335c209c7877e55fbfe2eb80eda8993 | |
parent | 490b9c7aa0a31294aaa2b445c59cfb95979b7f04 (diff) |
sparc64: Use correct pt_regs in decode_access_size() error paths.
[ Upstream commit baa06775e224e9f74e5c2de894c95cd49678beff ]
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 378ca82b9ccc..95a8e9a5125d 100644 --- a/arch/sparc/kernel/unaligned_64.c +++ b/arch/sparc/kernel/unaligned_64.c | |||
@@ -49,7 +49,7 @@ static inline enum direction decode_direction(unsigned int insn) | |||
49 | } | 49 | } |
50 | 50 | ||
51 | /* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */ | 51 | /* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */ |
52 | static inline int decode_access_size(unsigned int insn) | 52 | static inline int decode_access_size(struct pt_regs *regs, unsigned int insn) |
53 | { | 53 | { |
54 | unsigned int tmp; | 54 | unsigned int tmp; |
55 | 55 | ||
@@ -65,7 +65,7 @@ static inline int decode_access_size(unsigned int insn) | |||
65 | return 2; | 65 | return 2; |
66 | else { | 66 | else { |
67 | printk("Impossible unaligned trap. insn=%08x\n", insn); | 67 | printk("Impossible unaligned trap. insn=%08x\n", insn); |
68 | die_if_kernel("Byte sized unaligned access?!?!", current_thread_info()->kregs); | 68 | die_if_kernel("Byte sized unaligned access?!?!", regs); |
69 | 69 | ||
70 | /* GCC should never warn that control reaches the end | 70 | /* GCC should never warn that control reaches the end |
71 | * of this function without returning a value because | 71 | * of this function without returning a value because |
@@ -289,7 +289,7 @@ static void log_unaligned(struct pt_regs *regs) | |||
289 | asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) | 289 | asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) |
290 | { | 290 | { |
291 | enum direction dir = decode_direction(insn); | 291 | enum direction dir = decode_direction(insn); |
292 | int size = decode_access_size(insn); | 292 | int size = decode_access_size(regs, insn); |
293 | int orig_asi, asi; | 293 | int orig_asi, asi; |
294 | 294 | ||
295 | current_thread_info()->kern_una_regs = regs; | 295 | current_thread_info()->kern_una_regs = regs; |