diff options
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4367ce4db52a..b1e407a4fbda 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -168,7 +168,7 @@ static inline void console_verbose(void) | |||
168 | 168 | ||
169 | extern void bust_spinlocks(int yes); | 169 | extern void bust_spinlocks(int yes); |
170 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ | 170 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ |
171 | extern int panic_timeout; | 171 | extern __deprecated_for_modules int panic_timeout; |
172 | extern int panic_on_oops; | 172 | extern int panic_on_oops; |
173 | extern int tainted; | 173 | extern int tainted; |
174 | extern const char *print_tainted(void); | 174 | extern const char *print_tainted(void); |
@@ -266,7 +266,6 @@ extern void dump_stack(void); | |||
266 | 266 | ||
267 | /** | 267 | /** |
268 | * container_of - cast a member of a structure out to the containing structure | 268 | * container_of - cast a member of a structure out to the containing structure |
269 | * | ||
270 | * @ptr: the pointer to the member. | 269 | * @ptr: the pointer to the member. |
271 | * @type: the type of the container struct this is embedded in. | 270 | * @type: the type of the container struct this is embedded in. |
272 | * @member: the name of the member within the struct. | 271 | * @member: the name of the member within the struct. |
@@ -307,7 +306,7 @@ struct sysinfo { | |||
307 | char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ | 306 | char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ |
308 | }; | 307 | }; |
309 | 308 | ||
310 | /* Force a compilation error if condition is false */ | 309 | /* Force a compilation error if condition is true */ |
311 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) | 310 | #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) |
312 | 311 | ||
313 | #ifdef CONFIG_SYSCTL | 312 | #ifdef CONFIG_SYSCTL |