From 2d331d468e5a1f0955d206985180c4cc6660f5c3 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 29 Oct 2008 14:01:15 -0700
Subject: [PATCH] --- yaml --- r: 118048 b: refs/heads/master c:
 7106a27b52940085c2c3f6e42742d3a2a84d872a h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0d34e2440e5d..3e937dc9f892 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89a056df78b113fcab21d71cd24aa1893c09225b
+refs/heads/master: 7106a27b52940085c2c3f6e42742d3a2a84d872a
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 396a350b87a6..fba141d3ca07 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -116,6 +116,8 @@ extern int _cond_resched(void);
 # define might_resched() do { } while (0)
 #endif
 
+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+  void __might_sleep(char *file, int line);
 /**
  * might_sleep - annotation for functions that can sleep
  *
@@ -126,8 +128,6 @@ extern int _cond_resched(void);
  * be bitten later when the calling function happens to sleep when it is not
  * supposed to.
  */
-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
-  void __might_sleep(char *file, int line);
 # define might_sleep() \
 	do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)
 #else