diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 07:20:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 07:20:51 -0400 |
| commit | 1ecc818c51b1f6886825dae3885792d5e49ec798 (patch) | |
| tree | 2179ae53fa86ea6a42d01ff4efc1a3f6a32e76f2 /include/linux/kernel.h | |
| parent | 1c09ab0d257317f97e8629a3d0c8713d6dd9de4c (diff) | |
| parent | d902db1eb60387040fe541573083e47469db50ac (diff) | |
Merge branch 'sched/core-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into sched/core
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 953352a88336..567a6f7bbeed 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -121,7 +121,7 @@ extern int _cond_resched(void); | |||
| 121 | # define might_resched() do { } while (0) | 121 | # define might_resched() do { } while (0) |
| 122 | #endif | 122 | #endif |
| 123 | 123 | ||
| 124 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP | 124 | #ifdef CONFIG_DEBUG_ATOMIC_SLEEP |
| 125 | void __might_sleep(const char *file, int line, int preempt_offset); | 125 | void __might_sleep(const char *file, int line, int preempt_offset); |
| 126 | /** | 126 | /** |
| 127 | * might_sleep - annotation for functions that can sleep | 127 | * might_sleep - annotation for functions that can sleep |