diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-01-17 20:28:07 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-01-17 20:28:07 -0800 |
| commit | 9790ee6f6a30db6b9fd4f27e437b87fa8e511cdd (patch) | |
| tree | 5283a41fba9fe6a85c0ed186ad0469dd0cc04323 /include/linux/kernel.h | |
| parent | bcb39c06eefc908121323c23ead2fdd246585ad3 (diff) | |
| parent | fdefff6242ce95e350570a7f65e1ff49bc3a66b6 (diff) | |
Merge ia64 test tree back into release tree.
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 1d33d8dcbc1b..806491a0ab59 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -16,6 +16,8 @@ #include <asm/byteorder.h> #include <asm/bug.h> +extern const char linux_banner[]; + #define INT_MAX ((int)(~0U>>1)) #define INT_MIN (-INT_MAX - 1) #define UINT_MAX (~0U) @@ -134,6 +136,7 @@ static inline void console_verbose(void) extern void bust_spinlocks(int yes); extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ +extern int panic_timeout; extern int panic_on_oops; extern int tainted; extern const char *print_tainted(void); |