diff options
author | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-08-12 18:08:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 19:07:29 -0400 |
commit | 070cb06593006e7d565d4763380f3edd8dbdc134 (patch) | |
tree | 70a71b6616bf4794a0da7398c8f282237977d618 /include/linux/kernel.h | |
parent | 29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a (diff) |
move kernel-doc comment for might_sleep directly before its defining block
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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; | |||
108 | struct pt_regs; | 108 | struct pt_regs; |
109 | struct user; | 109 | struct user; |
110 | 110 | ||
111 | #ifdef CONFIG_PREEMPT_VOLUNTARY | ||
112 | extern int _cond_resched(void); | ||
113 | # define might_resched() _cond_resched() | ||
114 | #else | ||
115 | # define might_resched() do { } while (0) | ||
116 | #endif | ||
117 | |||
111 | /** | 118 | /** |
112 | * might_sleep - annotation for functions that can sleep | 119 | * might_sleep - annotation for functions that can sleep |
113 | * | 120 | * |
@@ -118,13 +125,6 @@ struct user; | |||
118 | * be bitten later when the calling function happens to sleep when it is not | 125 | * be bitten later when the calling function happens to sleep when it is not |
119 | * supposed to. | 126 | * supposed to. |
120 | */ | 127 | */ |
121 | #ifdef CONFIG_PREEMPT_VOLUNTARY | ||
122 | extern int _cond_resched(void); | ||
123 | # define might_resched() _cond_resched() | ||
124 | #else | ||
125 | # define might_resched() do { } while (0) | ||
126 | #endif | ||
127 | |||
128 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP | 128 | #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP |
129 | void __might_sleep(char *file, int line); | 129 | void __might_sleep(char *file, int line); |
130 | # define might_sleep() \ | 130 | # define might_sleep() \ |