diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-25 07:28:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-25 07:28:05 -0700 |
| commit | 2ce067b09aff22fcfe57e805e5abf409d4547dd1 (patch) | |
| tree | c73baa99b8cedcccfc6f2cd14a006f94160175e3 /include/linux/kernel.h | |
| parent | 56d8b39d50e64ca5f9e20cfcd79870dd4109974f (diff) | |
| parent | 4ab1a3e6a2904f6265c20ad0b1144092bbd2529a (diff) | |
Merge bk://ldm.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5efa540d55f8..44c38b134498 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -40,6 +40,13 @@ struct completion; +#ifdef CONFIG_DEBUG_KERNEL +void __might_sleep(char *file, int line); +#define might_sleep() __might_sleep(__FILE__, __LINE__) +#else +#define might_sleep() do {} while(0) +#endif + extern struct notifier_block *panic_notifier_list; NORET_TYPE void panic(const char * fmt, ...) __attribute__ ((NORET_AND format (printf, 1, 2))); |