diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:11:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:11:31 -0800 |
| commit | f6d13daaddeb6e63b15a93bf36a80173bafd29bf (patch) | |
| tree | fbdd45b284d537865036e8e8d740d849be0bbfc3 /include | |
| parent | d4a63a83933bcd1ef4f3ff6e8637e187dea25632 (diff) | |
| parent | 5e3c1afd4587e70c201bf7224b51f747c9a3dfa8 (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"A couple of regression fixes mostly hitting virtualized setups, but
also some bare metal systems"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/x86/tsc: Initialize multiplier to 0
sched/clock: Fixup early initialization
sched/preempt/x86: Fix voluntary preempt for x86
Revert "sched: Fix sleep time double accounting in enqueue entity"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/preempt.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 59749fc4832..de83b4eb164 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -134,7 +134,6 @@ do { \ #undef preempt_check_resched #endif -#ifdef CONFIG_PREEMPT #define preempt_set_need_resched() \ do { \ set_preempt_need_resched(); \ @@ -144,10 +143,6 @@ do { \ if (tif_need_resched()) \ set_preempt_need_resched(); \ } while (0) -#else -#define preempt_set_need_resched() do { } while (0) -#define preempt_fold_need_resched() do { } while (0) -#endif #ifdef CONFIG_PREEMPT_NOTIFIERS |