X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=kernel%2Fsched%2Fcore.c;h=d7babcc7cb76e8311399de29b9db708ed5c2dbb9;hb=35a773a07926a22bf19d77ee00024522279c4e68;hp=b2ec53c1a9746a54ac58d38509c927928b98fd05;hpb=9af6528ee9b682df7f29dbee86fbba0b67eab944;p=cascardo%2Flinux.git

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b2ec53c1a974..d7babcc7cb76 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4883,6 +4883,7 @@ SYSCALL_DEFINE0(sched_yield)
 	return 0;
 }
 
+#ifndef CONFIG_PREEMPT
 int __sched _cond_resched(void)
 {
 	if (should_resched(0)) {
@@ -4892,6 +4893,7 @@ int __sched _cond_resched(void)
 	return 0;
 }
 EXPORT_SYMBOL(_cond_resched);
+#endif
 
 /*
  * __cond_resched_lock() - if a reschedule is pending, drop the given lock,