diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-01-06 23:38:43 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-01-06 23:38:43 -0600 |
| commit | eeacc9367455a3bbbed00ced63a06c65fe347784 (patch) | |
| tree | 55b12e320e6065468186214509cc08076e0fb32f /include/linux/kernel.h | |
| parent | 351b11abdb0c25cb383b8e881939a6e2f3d64c28 (diff) | |
| parent | a34aca8a2ee295cc711418518f1d8c9fe099833d (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 9cb6277f5b86..7eedbb751856 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -84,6 +84,7 @@ extern unsigned long long memparse(char *ptr, char **retptr); extern void dev_probe_lock(void); extern void dev_probe_unlock(void); +extern int kernel_text_address(unsigned long addr); extern int session_of_pgrp(int pgrp); asmlinkage int printk(const char * fmt, ...) @@ -105,7 +106,7 @@ extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in extern int tainted; extern const char *print_tainted(void); -#define TAINT_PROPRIETORY_MODULE (1<<0) +#define TAINT_PROPRIETARY_MODULE (1<<0) #define TAINT_FORCED_MODULE (1<<1) #define TAINT_UNSAFE_SMP (1<<2) #define TAINT_FORCED_RMMOD (1<<3) |