From 47aca2ec9fc45f619a4af086df6b4f0388e354b7 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 25 Jan 2008 21:08:28 +0100
Subject: [PATCH] --- yaml --- r: 76177 b: refs/heads/master c:
 02b67cc3ba36bdba351d6c3a00593f4ec550d9d3 h: refs/heads/master i:   76175:
 8f91bcef8990589d95a38517ae738b99a00fa4b1 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/kernel.h |  4 ++--
 trunk/include/linux/sched.h  | 13 ++++++++++++-
 trunk/kernel/sched.c         |  6 ++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5579cef60226..bf3287db9c7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03319ec8b06849051747a17aa2a0f9aba9277980
+refs/heads/master: 02b67cc3ba36bdba351d6c3a00593f4ec550d9d3
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 94bc99656963..a7283c9beadf 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -105,8 +105,8 @@ struct user;
  * supposed to.
  */
 #ifdef CONFIG_PREEMPT_VOLUNTARY
-extern int cond_resched(void);
-# define might_resched() cond_resched()
+extern int _cond_resched(void);
+# define might_resched() _cond_resched()
 #else
 # define might_resched() do { } while (0)
 #endif
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index fe3f8fbc614e..7907845c2348 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1885,7 +1885,18 @@ static inline int need_resched(void)
  * cond_resched_lock() will drop the spinlock before scheduling,
  * cond_resched_softirq() will enable bhs before scheduling.
  */
-extern int cond_resched(void);
+#ifdef CONFIG_PREEMPT
+static inline int cond_resched(void)
+{
+	return 0;
+}
+#else
+extern int _cond_resched(void);
+static inline int cond_resched(void)
+{
+	return _cond_resched();
+}
+#endif
 extern int cond_resched_lock(spinlock_t * lock);
 extern int cond_resched_softirq(void);
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index b9ee0f4db66a..6ee37602a6d8 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4678,7 +4678,8 @@ static void __cond_resched(void)
 	} while (need_resched());
 }
 
-int __sched cond_resched(void)
+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_VOLUNTARY)
+int __sched _cond_resched(void)
 {
 	if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) &&
 					system_state == SYSTEM_RUNNING) {
@@ -4687,7 +4688,8 @@ int __sched cond_resched(void)
 	}
 	return 0;
 }
-EXPORT_SYMBOL(cond_resched);
+EXPORT_SYMBOL(_cond_resched);
+#endif
 
 /*
  * cond_resched_lock() - if a reschedule is pending, drop the given lock,