aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-28 00:44:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-20 11:05:05 -0700
commitffcf147fd9ba78f295eca28047432d3854750186 (patch)
tree9cdad755bbfd2958d44fb52d58eaff4874579c60
parentbb059936d620e34e69b72a667ad23a84432a7b85 (diff)
sparc64: Fix global reg snapshotting on self-cpu.
[ Upstream commit 17b6f586b8e27914b36c9ed7f3e4d289e6274a80 ] We were picking %i7 out of the wrong register window stack slot. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/sparc64/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 2084f81a76e..df54391b657 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -320,7 +320,7 @@ static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs,
rw = (struct reg_window *)
(regs->u_regs[UREG_FP] + STACK_BIAS);
- global_reg_snapshot[this_cpu].i7 = rw->ins[6];
+ global_reg_snapshot[this_cpu].i7 = rw->ins[7];
} else
global_reg_snapshot[this_cpu].i7 = 0;