From 5a1c27c5dc5b7bee05b0b3367861956702c37126 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 27 Jan 2009 13:58:08 +0100
Subject: [PATCH] --- yaml --- r: 139043 b: refs/heads/master c:
 cf2ad4d13c4ac6366c730fcf6c6be00db12fb75f h: refs/heads/master i:   139041:
 fc26da9552b7cc524db62cd8dd2bc2d077cc112d   139039:
 6b126fa91277a72af53ae6a7ac50a602058f65e1 v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/lockdep.c | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6386d3e0b458..19a2be1f7774 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d3651a23dc1f7ed7d207f9118459d3a73d485a7
+refs/heads/master: cf2ad4d13c4ac6366c730fcf6c6be00db12fb75f
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index 000d53a2da32..f40d916c191c 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -2099,14 +2099,6 @@ enum mark_type {
 #undef LOCKDEP_STATE
 };
 
-#define MARK_HELD_CASE(__STATE)						\
-	case __STATE:							\
-		if (hlock->read)					\
-			usage_bit = LOCK_ENABLED_##__STATE##_READ;	\
-		else							\
-			usage_bit = LOCK_ENABLED_##__STATE;		\
-		break;
-
 /*
  * Mark all held locks with a usage bit:
  */
@@ -2120,13 +2112,11 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark)
 	for (i = 0; i < curr->lockdep_depth; i++) {
 		hlock = curr->held_locks + i;
 
-		switch (mark) {
-#define LOCKDEP_STATE(__STATE) MARK_HELD_CASE(__STATE)
-#include "lockdep_states.h"
-#undef LOCKDEP_STATE
-		default:
-			BUG();
-		}
+		usage_bit = 2 + (mark << 2); /* ENABLED */
+		if (hlock->read)
+			usage_bit += 1; /* READ */
+
+		BUG_ON(usage_bit >= LOCK_USAGE_STATES);
 
 		if (!mark_lock(curr, hlock, usage_bit))
 			return 0;