From 9431ac98dc3266106e3567fe589c9fb716627874 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 3 Dec 2008 19:36:05 -0800
Subject: [PATCH] --- yaml --- r: 119703 b: refs/heads/master c:
 726c12f57d7e3ff43693d88e13b1ff02464c75d3 h: refs/heads/master i:   119701:
 7d59968e2722ce92751db7b7d6d3c6c8f4f5fab1   119699:
 b802a185df7d437fde7b05be5fc3f3bbda9c22a1   119695:
 3d0d911c965a77299b5e611c9f1c55cc4d515c11 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc64/kernel/visemul.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7142eb438322..51e98f4e1adc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8e8e80ee047b131a0cd6a3e96e0f8dfa14f6d99
+refs/heads/master: 726c12f57d7e3ff43693d88e13b1ff02464c75d3
diff --git a/trunk/arch/sparc64/kernel/visemul.c b/trunk/arch/sparc64/kernel/visemul.c
index 9e05cb5cb855..69f8a35c6bcd 100644
--- a/trunk/arch/sparc64/kernel/visemul.c
+++ b/trunk/arch/sparc64/kernel/visemul.c
@@ -131,7 +131,7 @@
 #define VIS_OPF_SHIFT	5
 #define VIS_OPF_MASK	(0x1ff << VIS_OPF_SHIFT)
 
-#define RS1(INSN)	(((INSN) >> 24) & 0x1f)
+#define RS1(INSN)	(((INSN) >> 14) & 0x1f)
 #define RS2(INSN)	(((INSN) >>  0) & 0x1f)
 #define RD(INSN)	(((INSN) >> 25) & 0x1f)
 
@@ -445,7 +445,7 @@ static void pdist(struct pt_regs *regs, unsigned int insn)
 	unsigned long i;
 
 	rs1 = fpd_regval(f, RS1(insn));
-	rs2 = fpd_regval(f, RS1(insn));
+	rs2 = fpd_regval(f, RS2(insn));
 	rd = fpd_regaddr(f, RD(insn));
 
 	rd_val = *rd;