summaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>2008-08-12 15:08:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:07:29 -0700
commit070cb06593006e7d565d4763380f3edd8dbdc134 (patch)
tree70a71b6616bf4794a0da7398c8f282237977d618 /include/linux/kernel.h
parent29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a (diff)
downloadkernel-crypto-070cb06593006e7d565d4763380f3edd8dbdc134.tar.gz
kernel-crypto-070cb06593006e7d565d4763380f3edd8dbdc134.tar.xz
kernel-crypto-070cb06593006e7d565d4763380f3edd8dbdc134.zip
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.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index aaa998f65c7..2651f805ba6 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() \