Merge branch 'merge'

1 files changed, 0 insertions, 57 deletions

diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 4efdaa9d3f43..a24b09c27718 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -10,7 +10,6 @@
  */
 
 
-#include <linux/cpumask.h>
 #include <linux/kexec.h>
 #include <linux/smp.h>
 #include <linux/thread_info.h>
@@ -21,7 +20,6 @@
 #include <asm/machdep.h>
 #include <asm/cacheflush.h>
 #include <asm/paca.h>
-#include <asm/lmb.h>
 #include <asm/mmu.h>
 #include <asm/sections.h>       /* _end */
 #include <asm/prom.h>
@@ -383,58 +381,3 @@ static int __init kexec_setup(void)
         return 0;
 }
 __initcall(kexec_setup);
-
-static int __init early_parse_crashk(char *p)
-{
-        unsigned long size;
-
-        if (!p)
-                return 1;
-
-        size = memparse(p, &p);
-
-        if (*p == '@')
-                crashk_res.start = memparse(p + 1, &p);
-        else
-                crashk_res.start = KDUMP_KERNELBASE;
-
-        crashk_res.end = crashk_res.start + size - 1;
-
-        return 0;
-}
-early_param("crashkernel", early_parse_crashk);
-
-void __init reserve_crashkernel(void)
-{
-        unsigned long size;
-
-        if (crashk_res.start == 0)
-                return;
-
-        /* We might have got these values via the command line or the
-         * device tree, either way sanitise them now. */
-
-        size = crashk_res.end - crashk_res.start + 1;
-
-        if (crashk_res.start != KDUMP_KERNELBASE)
-                printk("Crash kernel location must be 0x%x\n",
-                                KDUMP_KERNELBASE);
-
-        crashk_res.start = KDUMP_KERNELBASE;
-        size = PAGE_ALIGN(size);
-        crashk_res.end = crashk_res.start + size - 1;
-
-        /* Crash kernel trumps memory limit */
-        if (memory_limit && memory_limit <= crashk_res.end) {
-                memory_limit = crashk_res.end + 1;
-                printk("Adjusted memory limit for crashkernel, now 0x%lx\n",
-                                memory_limit);
-        }
-
-        lmb_reserve(crashk_res.start, size);
-}
-
-int overlaps_crashkernel(unsigned long start, unsigned long size)
-{
-        return (start + size) > crashk_res.start && start <= crashk_res.end;
-}