diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /include/linux/kernel.h | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
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 c73ed0b05591..2ae50277f581 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -177,7 +177,7 @@ static inline void console_verbose(void) | |||
| 177 | 177 | ||
| 178 | extern void bust_spinlocks(int yes); | 178 | extern void bust_spinlocks(int yes); |
| 179 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ | 179 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ |
| 180 | extern __deprecated_for_modules int panic_timeout; | 180 | extern int panic_timeout; |
| 181 | extern int panic_on_oops; | 181 | extern int panic_on_oops; |
| 182 | extern int tainted; | 182 | extern int tainted; |
| 183 | extern const char *print_tainted(void); | 183 | extern const char *print_tainted(void); |