Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

[linux-2.6-omap-h63xx.git] / kernel / kexec.c

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 777ac458ac993b8195a3c3cb7042a941ba611339..3fb855ad6aa07fb5e03281aab28a1d163fb7686d 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -30,6 +30,7 @@
 #include <linux/pm.h>
 #include <linux/cpu.h>
 #include <linux/console.h>
+#include <linux/vmalloc.h>
 
 #include <asm/page.h>
 #include <asm/uaccess.h>
@@ -1115,7 +1116,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)
        struct elf_prstatus prstatus;
        u32 *buf;
 
-       if ((cpu < 0) || (cpu >= NR_CPUS))
+       if ((cpu < 0) || (cpu >= nr_cpu_ids))
                return;
 
        /* Using ELF notes here is opportunistic.