diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 22:45:39 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 22:45:39 +1100 |
| commit | 03bc26cfefd6db756e6bc7fcda11dc17ada7be16 (patch) | |
| tree | 36b4cdbd02e464a016d78e4b520595922d803e68 /kernel/extable.c | |
| parent | 8cd226ca3f64f28c8123ebfaa6afe8dc8c18b174 (diff) | |
| parent | 6494a93d55fad586238cc1940e846c6d03e1aaf6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
Module: check to see if we have a built in module with the same name
module: add module taint on ndiswrapper
module: fix the module name length in param_sysfs_builtin
module: make module_address_lookup safe
module: better OOPS and lockdep coverage for loading modules
module: Fix gratuitous sprintf in module.c
module: wait for dependent modules doing init.
module: Don't report discarded init pages as kernel text.
Diffstat (limited to 'kernel/extable.c')
| -rw-r--r-- | kernel/extable.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/extable.c b/kernel/extable.c index 7fe262855317..a26cb2e17023 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -46,7 +46,8 @@ int core_kernel_text(unsigned long addr) addr <= (unsigned long)_etext) return 1; - if (addr >= (unsigned long)_sinittext && + if (system_state == SYSTEM_BOOTING && + addr >= (unsigned long)_sinittext && addr <= (unsigned long)_einittext) return 1; return 0; |