ppc64: wrap pidhash reference for the moment

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index 9ebe8e0c76c944eeacd6b44a9a78e2d90f39040a..ab0821860c4a39e34902d79f0a6d3c7fd1ff8c87 100644 (file)
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -90,7 +90,9 @@ _STATIC(__start)
         * between physical addresses and absolute addresses) and
         * to the pidhash table (also used by the debugger) */
        .llong msChunks-KERNELBASE
+#ifdef CONFIG_PPC_ISERIES
        .llong pidhash-KERNELBASE
+#endif
 
        /* Offset 0x38 - Pointer to start of embedded System.map */
        .globl  embedded_sysmap_start

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 312cf19bd55c323fb931c7ca30a81989103e6306..8fd148a3244bb74a44d8ecacf16dd7c470c2c79f 100644 (file)
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -469,11 +469,6 @@ void __init time_init(void)
        last_rtc_update = xtime.tv_sec;
        write_unlock_irqrestore(&xtime_lock, flags);
 
-#ifdef CONFIG_PPC_ISERIES
-       /* HACK HACK This allows the iSeries profiling to use /proc/profile */
-       prof_shift = 0;
-#endif
-
        /* Not exact, but the timer interrupt takes care of this */
        set_dec(tb_ticks_per_jiffy);
 }

diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index 564bfb7839dcfef7d7449bc8729ba7b16c696b14..fc134c19a46f3fe0ea06dd2ac65850d80c0bc3b5 100644 (file)
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -498,13 +498,6 @@ void __init paging_init(void)
 }
 #endif
 
-extern unsigned long prof_shift;
-extern unsigned long prof_len;
-extern unsigned int * prof_buffer;
-extern unsigned long dprof_shift;
-extern unsigned long dprof_len;
-extern unsigned int * dprof_buffer;
-
 void initialize_paca_hardware_interrupt_stack(void);
 
 void __init mem_init(void)
@@ -577,10 +570,6 @@ void __init mem_init(void)
 
 #ifdef CONFIG_PPC_ISERIES
        create_virtual_bus_tce_table();
-       /* HACK HACK This allows the iSeries profiling to use /proc/profile */
-       prof_shift = dprof_shift;
-       prof_len = dprof_len;
-       prof_buffer = dprof_buffer;
 #endif
 }