diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 15:17:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 15:17:35 +1100 |
| commit | 8267d3c5bc37b6684f35031476717ce102750258 (patch) | |
| tree | 2203d97ac042d5aa5c0a62dd3de5e7f363ee5b81 /include | |
| parent | cc3528537d2541445ae3ce4a666c8259f54119f9 (diff) | |
| parent | a881214af7025692df7329c477edb044a3920bb4 (diff) | |
Merge branch 'quilt/kernel-doc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index b41c5cb37917..362d17be4b5d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -116,6 +116,8 @@ extern int _cond_resched(void); # define might_resched() do { } while (0) #endif +#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP + void __might_sleep(char *file, int line); /** * might_sleep - annotation for functions that can sleep * @@ -126,8 +128,6 @@ extern int _cond_resched(void); * be bitten later when the calling function happens to sleep when it is not * supposed to. */ -#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP - void __might_sleep(char *file, int line); # define might_sleep() \ do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0) #else |