[PATCH] powerpc: remove do-nothing cpu setup routines

[linux-beck.git] / arch / powerpc / kernel / cpu_setup_power4.S

diff --git a/arch/powerpc/kernel/cpu_setup_power4.S b/arch/powerpc/kernel/cpu_setup_power4.S
index cca942fe61154ecb9883cdc3c6e6007eade0f228..271418308d536de53601ae69a0c070ac24a11490 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_power4.S
+++ b/arch/powerpc/kernel/cpu_setup_power4.S
@@ -73,23 +73,6 @@ _GLOBAL(__970_cpu_preinit)
        isync
        blr
 
-_GLOBAL(__setup_cpu_power4)
-       blr
-
-_GLOBAL(__setup_cpu_be)
-        /* Set large page sizes LP=0: 16MB, LP=1: 64KB */
-        addi    r3, 0,  0
-        ori     r3, r3, HID6_LB
-        sldi    r3, r3, 32
-        nor     r3, r3, r3
-        mfspr   r4, SPRN_HID6
-        and     r4, r4, r3
-        addi    r3, 0, 0x02000
-        sldi    r3, r3, 32
-        or      r4, r4, r3
-        mtspr   SPRN_HID6, r4
-       blr
-
 _GLOBAL(__setup_cpu_ppc970)
        mfspr   r0,SPRN_HID0
        li      r11,5                   /* clear DOZE and SLEEP */
@@ -130,7 +113,7 @@ _GLOBAL(__save_cpu_setup)
        mfcr    r7
 
        /* Get storage ptr */
-       LOADADDR(r5,cpu_state_storage)
+       LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
 
        /* We only deal with 970 for now */
        mfspr   r0,SPRN_PVR
@@ -164,7 +147,7 @@ _GLOBAL(__restore_cpu_setup)
        /* Get storage ptr (FIXME when using anton reloc as we
         * are running with translation disabled here
         */
-       LOADADDR(r5,cpu_state_storage)
+       LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
 
        /* We only deal with 970 for now */
        mfspr   r0,SPRN_PVR