From 813a81c093bfe77235c1f7aa31554f955edef032 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 25 Feb 2011 20:19:32 +0100
Subject: [PATCH] --- yaml --- r: 233968 b: refs/heads/master c:
 ba55d3db9bb59a52fe45dbc5d62776adbb289e54 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/kernel/ptrace.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bb68b14d2bb3..262e33f21976 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f3112707fabc2f9f932a4ac1c5b92f3266e4662
+refs/heads/master: ba55d3db9bb59a52fe45dbc5d62776adbb289e54
diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
index 19c6816db61e..b13e70f63d71 100644
--- a/trunk/arch/arm/kernel/ptrace.c
+++ b/trunk/arch/arm/kernel/ptrace.c
@@ -996,10 +996,10 @@ static int ptrace_gethbpregs(struct task_struct *tsk, long num,
 		while (!(arch_ctrl.len & 0x1))
 			arch_ctrl.len >>= 1;
 
-		if (idx & 0x1)
-			reg = encode_ctrl_reg(arch_ctrl);
-		else
+		if (num & 0x1)
 			reg = bp->attr.bp_addr;
+		else
+			reg = encode_ctrl_reg(arch_ctrl);
 	}
 
 put: