From 4e4b036fced9f5b4e7ef9b92c9cf130d5a2b3acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <Uwe.Kleine-Koenig@digi.com>
Date: Tue, 12 Aug 2008 15:08:59 -0700
Subject: [PATCH] --- yaml --- r: 108260 b: refs/heads/master c:
 070cb06593006e7d565d4763380f3edd8dbdc134 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cdf683db7a49..fd20d685efcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a
+refs/heads/master: 070cb06593006e7d565d4763380f3edd8dbdc134
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index aaa998f65c7a..2651f805ba6d 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -108,6 +108,13 @@ struct completion;
 struct pt_regs;
 struct user;
 
+#ifdef CONFIG_PREEMPT_VOLUNTARY
+extern int _cond_resched(void);
+# define might_resched() _cond_resched()
+#else
+# define might_resched() do { } while (0)
+#endif
+
 /**
  * might_sleep - annotation for functions that can sleep
  *
@@ -118,13 +125,6 @@ struct user;
  * be bitten later when the calling function happens to sleep when it is not
  * supposed to.
  */
-#ifdef CONFIG_PREEMPT_VOLUNTARY
-extern int _cond_resched(void);
-# define might_resched() _cond_resched()
-#else
-# define might_resched() do { } while (0)
-#endif
-
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
   void __might_sleep(char *file, int line);
 # define might_sleep() \