From cb7777bd9adc47d5eed2a6d06de44639d8fd0e8b Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 16 Aug 2012 19:02:12 +0100
Subject: [PATCH] --- yaml --- r: 322626 b: refs/heads/master c:
 d968d2b801d877601d54e35e6dd0f52d9c797c99 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4847db61cf41..ed9323ed8260 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf8801145c01ab600f8df66e8c879ac642fa5846
+refs/heads/master: d968d2b801d877601d54e35e6dd0f52d9c797c99
diff --git a/trunk/arch/arm/kernel/hw_breakpoint.c b/trunk/arch/arm/kernel/hw_breakpoint.c
index 18d39ea4c02f..281bf3301241 100644
--- a/trunk/arch/arm/kernel/hw_breakpoint.c
+++ b/trunk/arch/arm/kernel/hw_breakpoint.c
@@ -610,13 +610,14 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp)
 		/* Aligned */
 		break;
 	case 1:
-		/* Allow single byte watchpoint. */
-		if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)
-			break;
 	case 2:
 		/* Allow halfword watchpoints and breakpoints. */
 		if (info->ctrl.len == ARM_BREAKPOINT_LEN_2)
 			break;
+	case 3:
+		/* Allow single byte watchpoint. */
+		if (info->ctrl.len == ARM_BREAKPOINT_LEN_1)
+			break;
 	default:
 		ret = -EINVAL;
 		goto out;