diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 12:22:29 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 12:22:29 +0400 |
| commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
| tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /include/linux/kernel.h | |
| parent | b8e513a2ecafb5bb068c00be98d584871afcd4c3 (diff) | |
| parent | c5ad48f3117c4aae379b536f3270fc1efae945c0 (diff) | |
| download | linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 953352a88336..567a6f7bbeed 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -121,7 +121,7 @@ extern int _cond_resched(void); # define might_resched() do { } while (0) #endif -#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP +#ifdef CONFIG_DEBUG_ATOMIC_SLEEP void __might_sleep(const char *file, int line, int preempt_offset); /** * might_sleep - annotation for functions that can sleep |