1 files changed, 4 insertions, 38 deletions

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 7881ec96ef11..d34fe537400e 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -205,14 +205,6 @@ static cell_t __initdata regbuf[1024];
 
 #define MAX_CPU_THREADS 2
 
-/* TO GO */
-#ifdef CONFIG_HMT
-struct {
-        unsigned int pir;
-        unsigned int threadid;
-} hmt_thread_data[NR_CPUS];
-#endif /* CONFIG_HMT */
-
 /*
  * Error results ... some OF calls will return "-1" on error, some
  * will return 0, some will return either. To simplify, here are
@@ -1319,10 +1311,6 @@ static void __init prom_hold_cpus(void)
          */
         *spinloop = 0;
 
-#ifdef CONFIG_HMT
-        for (i = 0; i < NR_CPUS; i++)
-                RELOC(hmt_thread_data)[i].pir = 0xdeadbeef;
-#endif
         /* look for cpus */
         for (node = 0; prom_next_node(&node); ) {
                 type[0] = 0;
@@ -1389,32 +1377,6 @@ static void __init prom_hold_cpus(void)
                 /* Reserve cpu #s for secondary threads.   They start later. */
                 cpuid += cpu_threads;
         }
-#ifdef CONFIG_HMT
-        /* Only enable HMT on processors that provide support. */
-        if (__is_processor(PV_PULSAR) || 
-            __is_processor(PV_ICESTAR) ||
-            __is_processor(PV_SSTAR)) {
-                prom_printf("    starting secondary threads\n");
-
-                for (i = 0; i < NR_CPUS; i += 2) {
-                        if (!cpu_online(i))
-                                continue;
-
-                        if (i == 0) {
-                                unsigned long pir = mfspr(SPRN_PIR);
-                                if (__is_processor(PV_PULSAR)) {
-                                        RELOC(hmt_thread_data)[i].pir = 
-                                                pir & 0x1f;
-                                } else {
-                                        RELOC(hmt_thread_data)[i].pir = 
-                                                pir & 0x3ff;
-                                }
-                        }
-                }
-        } else {
-                prom_printf("Processor is not HMT capable\n");
-        }
-#endif
 
         if (cpuid > NR_CPUS)
                 prom_printf("WARNING: maximum CPUs (" __stringify(NR_CPUS)
@@ -2098,6 +2060,10 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          */
         prom_init_stdout();
 
+        /* Bail if this is a kdump kernel. */
+        if (PHYSICAL_START > 0)
+                prom_panic("Error: You can't boot a kdump kernel from OF!\n");
+
         /*
          * Check for an initrd
          */