diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-23 19:46:59 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-23 19:46:59 +0400 |
| commit | 87ce786ae5f24e336195805a9fc7428a6f922478 (patch) | |
| tree | 4e756c5b49dadcd4b9cf46a1a0e3593ccadfb291 /include/linux/kernel.h | |
| parent | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (diff) | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| download | linux-87ce786ae5f24e336195805a9fc7428a6f922478.tar.xz | |
Merge branch 'x86/cpu' into x86/x2apic
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index aaa998f65c7a..2651f805ba6d 100644 --- a/include/linux/kernel.h +++ b/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() \ |