diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 19:04:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 19:04:42 -0700 |
| commit | eed9fa3557ee54cc7e38a098420c42c9ac93cb50 (patch) | |
| tree | 4bab0ef48a761d903a201c860e55851dbb4efdb8 /include/linux/kernel.h | |
| parent | 551a46389b4dc3792bee6b182e080915f2094dd5 (diff) | |
| parent | d8ea15425d8dc047c43a302b53c372d4d333c86f (diff) | |
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 40307a28bb4b..cf2f984e1b95 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -136,6 +136,7 @@ extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in extern int panic_on_oops; extern int tainted; extern const char *print_tainted(void); +extern void add_taint(unsigned); /* Values used for system_state */ extern enum system_states { @@ -150,6 +151,8 @@ extern enum system_states { #define TAINT_FORCED_MODULE (1<<1) #define TAINT_UNSAFE_SMP (1<<2) #define TAINT_FORCED_RMMOD (1<<3) +#define TAINT_MACHINE_CHECK (1<<4) +#define TAINT_BAD_PAGE (1<<5) extern void dump_stack(void); |