summaryrefslogtreecommitdiff
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorPatrick Mochel <mochel@osdl.org>2003-09-03 18:16:01 -0700
committerPatrick Mochel <mochel@osdl.org>2003-09-03 18:16:01 -0700
commitd168c5dc5c3c3c5f2966791231fc76ecf1d1144d (patch)
tree1c6be3d55d4f27e1acef92bf38b3e321f92a40d0 /include/linux/kernel.h
parent5abf1ee2aaacbc6ed000a9490f580d5b1cad1a08 (diff)
parent6cea4e9ecabb8f3f07cdb60b17054549e591bc30 (diff)
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b0aebfeda888..b2d17ea0dac0 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -52,8 +52,10 @@ struct completion;
#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
void __might_sleep(char *file, int line);
#define might_sleep() __might_sleep(__FILE__, __LINE__)
+#define might_sleep_if(cond) do { if (unlikely(cond)) might_sleep(); } while (0)
#else
#define might_sleep() do {} while(0)
+#define might_sleep_if(cond) do {} while (0)
#endif
extern struct notifier_block *panic_notifier_list;