diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /include/linux/kernel.h | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e1bd0842f6a1..f4fc576ed4c4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -124,6 +124,7 @@ extern int get_option(char **str, int *pint); | |||
| 124 | extern char *get_options(const char *str, int nints, int *ints); | 124 | extern char *get_options(const char *str, int nints, int *ints); |
| 125 | extern unsigned long long memparse(char *ptr, char **retptr); | 125 | extern unsigned long long memparse(char *ptr, char **retptr); |
| 126 | 126 | ||
| 127 | extern int core_kernel_text(unsigned long addr); | ||
| 127 | extern int __kernel_text_address(unsigned long addr); | 128 | extern int __kernel_text_address(unsigned long addr); |
| 128 | extern int kernel_text_address(unsigned long addr); | 129 | extern int kernel_text_address(unsigned long addr); |
| 129 | extern int session_of_pgrp(int pgrp); | 130 | extern int session_of_pgrp(int pgrp); |