diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-17 10:52:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-17 10:52:17 -0500 |
| commit | 81e53d0470878165a300d75ac06a5bc5eee543a2 (patch) | |
| tree | 5fdaacfb350c5a290109f98ab29e9858f1f11469 /include/linux/kernel.h | |
| parent | 15e0964dc2a097de3cf518badf2237b6b6adf7fe (diff) | |
| parent | fcb4ed749c776a2ae89ca40343cbccb6f8981e60 (diff) | |
Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d4e98d13eff4..ecb87544cc5d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -193,7 +193,8 @@ extern int _cond_resched(void); | |||
| 193 | (__x < 0) ? -__x : __x; \ | 193 | (__x < 0) ? -__x : __x; \ |
| 194 | }) | 194 | }) |
| 195 | 195 | ||
| 196 | #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP) | 196 | #if defined(CONFIG_MMU) && \ |
| 197 | (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)) | ||
| 197 | void might_fault(void); | 198 | void might_fault(void); |
| 198 | #else | 199 | #else |
| 199 | static inline void might_fault(void) { } | 200 | static inline void might_fault(void) { } |