releases/2.6.33.4/sparc64-use-correct-pt_regs-in-decode_access_size-error-paths.patch

   1 From 6bbe91c3a36d67e83199ba0d120df6a1a6c0ee17 Mon Sep 17 00:00:00 2001
   2 From: David S. Miller <davem@davemloft.net>
   3 Date: Mon, 19 Apr 2010 13:46:48 -0700
   4 Subject: sparc64: Use correct pt_regs in decode_access_size() error paths.
   5
   6
   7 From: David S. Miller <davem@davemloft.net>
   8
   9 [ Upstream commit baa06775e224e9f74e5c2de894c95cd49678beff ]
  10
  11 Signed-off-by: David S. Miller <davem@davemloft.net>
  12 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  13 ---
  14  arch/sparc/kernel/unaligned_64.c |    6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 --- a/arch/sparc/kernel/unaligned_64.c
  18 +++ b/arch/sparc/kernel/unaligned_64.c
  19 @@ -49,7 +49,7 @@ static inline enum direction decode_dire
  20  }
  21
  22  /* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */
  23 -static inline int decode_access_size(unsigned int insn)
  24 +static inline int decode_access_size(struct pt_regs *regs, unsigned int insn)
  25  {
  26         unsigned int tmp;
  27
  28 @@ -65,7 +65,7 @@ static inline int decode_access_size(uns
  29                 return 2;
  30         else {
  31                 printk("Impossible unaligned trap. insn=%08x\n", insn);
  32 -               die_if_kernel("Byte sized unaligned access?!?!", current_thread_info()->kregs);
  33 +               die_if_kernel("Byte sized unaligned access?!?!", regs);
  34
  35                 /* GCC should never warn that control reaches the end
  36                  * of this function without returning a value because
  37 @@ -289,7 +289,7 @@ static void log_unaligned(struct pt_regs
  38  asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)
  39  {
  40         enum direction dir = decode_direction(insn);
  41 -       int size = decode_access_size(insn);
  42 +       int size = decode_access_size(regs, insn);
  43         int orig_asi, asi;
  44
  45         current_thread_info()->kern_una_regs = regs;