Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[sfrench/cifs-2.6.git] / kernel / extable.c

diff --git a/kernel/extable.c b/kernel/extable.c
index 7fe2628553172eadc0d49a3cbaf9d779b80b5a7c..a26cb2e170237d849c9f87038a6def48ee948dd6 100644 (file)
--- 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;