diff options
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a5363324cf95..3b507bf05d09 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -185,6 +185,7 @@ extern enum system_states { | |||
185 | SYSTEM_HALT, | 185 | SYSTEM_HALT, |
186 | SYSTEM_POWER_OFF, | 186 | SYSTEM_POWER_OFF, |
187 | SYSTEM_RESTART, | 187 | SYSTEM_RESTART, |
188 | SYSTEM_SUSPEND_DISK, | ||
188 | } system_state; | 189 | } system_state; |
189 | 190 | ||
190 | #define TAINT_PROPRIETARY_MODULE (1<<0) | 191 | #define TAINT_PROPRIETARY_MODULE (1<<0) |
@@ -325,12 +326,6 @@ struct sysinfo { | |||
325 | /* Force a compilation error if condition is true */ | 326 | /* Force a compilation error if condition is true */ |
326 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) | 327 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) |
327 | 328 | ||
328 | #ifdef CONFIG_SYSCTL | ||
329 | extern int randomize_va_space; | ||
330 | #else | ||
331 | #define randomize_va_space 1 | ||
332 | #endif | ||
333 | |||
334 | /* Trap pasters of __FUNCTION__ at compile-time */ | 329 | /* Trap pasters of __FUNCTION__ at compile-time */ |
335 | #define __FUNCTION__ (__func__) | 330 | #define __FUNCTION__ (__func__) |
336 | 331 | ||