10 files changed, 86 insertions, 68 deletions

diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
index 32e75d0731a9..72d0c56c1b48 100644
--- a/arch/x86/kernel/crash_dump_32.c
+++ b/arch/x86/kernel/crash_dump_32.c
@@ -47,6 +47,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
                 if (!kdump_buf_page) {
                         printk(KERN_WARNING "Kdump: Kdump buffer page not"
                                 " allocated\n");
+                        kunmap_atomic(vaddr, KM_PTE0);
                         return -EFAULT;
                 }
                 copy_page(kdump_buf_page, vaddr);
diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index 3c86b979a40a..d58039e8de74 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -288,7 +288,8 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
                         request_resource(res, code_resource);
                         request_resource(res, data_resource);
 #ifdef CONFIG_KEXEC
-                        request_resource(res, &crashk_res);
+                        if (crashk_res.start != crashk_res.end)
+                                request_resource(res, &crashk_res);
 #endif
                 }
         }
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index e422b8159f69..57616865d8a0 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -226,7 +226,8 @@ void __init e820_reserve_resources(void)
                         request_resource(res, &code_resource);
                         request_resource(res, &data_resource);
 #ifdef CONFIG_KEXEC
-                        request_resource(res, &crashk_res);
+                        if (crashk_res.start != crashk_res.end)
+                                request_resource(res, &crashk_res);
 #endif
                 }
         }
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 8459ca64bc2f..11b935f4f886 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -149,28 +149,6 @@ NORET_TYPE void machine_kexec(struct kimage *image)
                         image->start, cpu_has_pae);
 }
 
-/* crashkernel=size@addr specifies the location to reserve for
- * a crash kernel.  By reserving this memory we guarantee
- * that linux never sets it up as a DMA target.
- * Useful for holding code to do something appropriate
- * after a kernel panic.
- */
-static int __init parse_crashkernel(char *arg)
-{
-        unsigned long size, base;
-        size = memparse(arg, &arg);
-        if (*arg == '@') {
-                base = memparse(arg+1, &arg);
-                /* FIXME: Do I want a sanity check
-                 * to validate the memory range?
-                 */
-                crashk_res.start = base;
-                crashk_res.end   = base + size - 1;
-        }
-        return 0;
-}
-early_param("crashkernel", parse_crashkernel);
-
 void arch_crash_save_vmcoreinfo(void)
 {
 #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 7450b69710b5..0d8577f05422 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -231,33 +231,6 @@ NORET_TYPE void machine_kexec(struct kimage *image)
                         image->start);
 }
 
-/* crashkernel=size@addr specifies the location to reserve for
- * a crash kernel.  By reserving this memory we guarantee
- * that linux never set's it up as a DMA target.
- * Useful for holding code to do something appropriate
- * after a kernel panic.
- */
-static int __init setup_crashkernel(char *arg)
-{
-        unsigned long size, base;
-        char *p;
-        if (!arg)
-                return -EINVAL;
-        size = memparse(arg, &p);
-        if (arg == p)
-                return -EINVAL;
-        if (*p == '@') {
-                base = memparse(p+1, &p);
-                /* FIXME: Do I want a sanity check to validate the
-                 * memory range?  Yes you do, but it's too early for
-                 * e820 -AK */
-                crashk_res.start = base;
-                crashk_res.end   = base + size - 1;
-        }
-        return 0;
-}
-early_param("crashkernel", setup_crashkernel);
-
 void arch_crash_save_vmcoreinfo(void)
 {
 #ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 097aeafce5ff..044a47745a5c 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -301,7 +301,7 @@ void show_regs(struct pt_regs * regs)
         unsigned long d0, d1, d2, d3, d6, d7;
 
         printk("\n");
-        printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
+        printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
         printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
         print_symbol("EIP is at %s\n", regs->eip);
 
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index b87a6fd5ba48..978dc0196a0f 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -378,6 +378,49 @@ extern unsigned long __init setup_memory(void);
 extern void zone_sizes_init(void);
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
+static inline unsigned long long get_total_mem(void)
+{
+        unsigned long long total;
+
+        total = max_low_pfn - min_low_pfn;
+#ifdef CONFIG_HIGHMEM
+        total += highend_pfn - highstart_pfn;
+#endif
+
+        return total << PAGE_SHIFT;
+}
+
+#ifdef CONFIG_KEXEC
+static void __init reserve_crashkernel(void)
+{
+        unsigned long long total_mem;
+        unsigned long long crash_size, crash_base;
+        int ret;
+
+        total_mem = get_total_mem();
+
+        ret = parse_crashkernel(boot_command_line, total_mem,
+                        &crash_size, &crash_base);
+        if (ret == 0 && crash_size > 0) {
+                if (crash_base > 0) {
+                        printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
+                                        "for crashkernel (System RAM: %ldMB)\n",
+                                        (unsigned long)(crash_size >> 20),
+                                        (unsigned long)(crash_base >> 20),
+                                        (unsigned long)(total_mem >> 20));
+                        crashk_res.start = crash_base;
+                        crashk_res.end   = crash_base + crash_size - 1;
+                        reserve_bootmem(crash_base, crash_size);
+                } else
+                        printk(KERN_INFO "crashkernel reservation failed - "
+                                        "you have to specify a base address\n");
+        }
+}
+#else
+static inline void __init reserve_crashkernel(void)
+{}
+#endif
+
 void __init setup_bootmem_allocator(void)
 {
         unsigned long bootmap_size;
@@ -453,11 +496,7 @@ void __init setup_bootmem_allocator(void)
                 }
         }
 #endif
-#ifdef CONFIG_KEXEC
-        if (crashk_res.start != crashk_res.end)
-                reserve_bootmem(crashk_res.start,
-                        crashk_res.end - crashk_res.start + 1);
-#endif
+        reserve_crashkernel();
 }
 
 /*
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 5a19f0cc5b67..cdcba6975226 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -191,6 +191,37 @@ static inline void copy_edd(void)
 }
 #endif
 
+#ifdef CONFIG_KEXEC
+static void __init reserve_crashkernel(void)
+{
+        unsigned long long free_mem;
+        unsigned long long crash_size, crash_base;
+        int ret;
+
+        free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;
+
+        ret = parse_crashkernel(boot_command_line, free_mem,
+                        &crash_size, &crash_base);
+        if (ret == 0 && crash_size) {
+                if (crash_base > 0) {
+                        printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
+                                        "for crashkernel (System RAM: %ldMB)\n",
+                                        (unsigned long)(crash_size >> 20),
+                                        (unsigned long)(crash_base >> 20),
+                                        (unsigned long)(free_mem >> 20));
+                        crashk_res.start = crash_base;
+                        crashk_res.end   = crash_base + crash_size - 1;
+                        reserve_bootmem(crash_base, crash_size);
+                } else
+                        printk(KERN_INFO "crashkernel reservation failed - "
+                                        "you have to specify a base address\n");
+        }
+}
+#else
+static inline void __init reserve_crashkernel(void)
+{}
+#endif
+
 #define EBDA_ADDR_POINTER 0x40E
 
 unsigned __initdata ebda_addr;
@@ -357,13 +388,7 @@ void __init setup_arch(char **cmdline_p)
                 }
         }
 #endif
-#ifdef CONFIG_KEXEC
-        if (crashk_res.start != crashk_res.end) {
-                reserve_bootmem_generic(crashk_res.start,
-                        crashk_res.end - crashk_res.start + 1);
-        }
-#endif
-
+        reserve_crashkernel();
         paging_init();
 
 #ifdef CONFIG_PCI
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 0d79df3c5631..6dc394b87255 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -200,8 +200,8 @@ badframe:
         if (show_unhandled_signals && printk_ratelimit())
                 printk("%s%s[%d] bad frame in sigreturn frame:%p eip:%lx"
                        " esp:%lx oeax:%lx\n",
-                    current->pid > 1 ? KERN_INFO : KERN_EMERG,
-                    current->comm, current->pid, frame, regs->eip,
+                    task_pid_nr(current) > 1 ? KERN_INFO : KERN_EMERG,
+                    current->comm, task_pid_nr(current), frame, regs->eip,
                     regs->esp, regs->orig_eax);
 
         force_sig(SIGSEGV, current);
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index b132d3957dfc..1e9d57256eb1 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -316,7 +316,7 @@ void show_registers(struct pt_regs *regs)
         printk(KERN_EMERG "ds: %04x   es: %04x   fs: %04x  gs: %04x  ss: %04x\n",
                regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
         printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
-                TASK_COMM_LEN, current->comm, current->pid,
+                TASK_COMM_LEN, current->comm, task_pid_nr(current),
                 current_thread_info(), current, task_thread_info(current));
         /*
          * When in-kernel, we also print out the stack and code at the
@@ -622,7 +622,7 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
             printk_ratelimit())
                 printk(KERN_INFO
                     "%s[%d] general protection eip:%lx esp:%lx error:%lx\n",
-                    current->comm, current->pid,
+                    current->comm, task_pid_nr(current),
                     regs->eip, regs->esp, error_code);
 
         force_sig(SIGSEGV, current);