vserver 2.0 rc7

[linux-2.6.git] / arch / ppc / platforms / k2.c

diff --git a/arch/ppc/platforms/k2.c b/arch/ppc/platforms/k2.c
index be5c051..aacb438 100644 (file)
--- a/arch/ppc/platforms/k2.c
+++ b/arch/ppc/platforms/k2.c
@@ -392,9 +392,9 @@ static int k2_get_cpu_speed(void)
        unsigned long hid1;
        int cpu_speed;
 
-       hid1 = mfspr(HID1) >> 28;
+       hid1 = mfspr(SPRN_HID1) >> 28;
 
-       if ((mfspr(PVR) >> 16) == 8)
+       if ((mfspr(SPRN_PVR) >> 16) == 8)
                hid1 = cpu_7xx[hid1];
        else
                hid1 = cpu_6xx[hid1];
@@ -472,7 +472,7 @@ static void __init k2_setup_arch(void)
                        "(source@mvista.com)\n");
 
        /* Identify the CPU manufacturer */
-       cpu = PVR_REV(mfspr(PVR));
+       cpu = PVR_REV(mfspr(SPRN_PVR));
        printk(KERN_INFO "CPU manufacturer: %s [rev=%04x]\n",
                        (cpu & (1 << 15)) ? "IBM" : "Motorola", cpu);
 }
@@ -486,8 +486,8 @@ static void k2_restart(char *cmd)
 
        /* SRR0 has system reset vector, SRR1 has default MSR value */
        /* rfi restores MSR from SRR1 and sets the PC to the SRR0 value */
-       mtspr(SRR0, 0xfff00100);
-       mtspr(SRR1, 0);
+       mtspr(SPRN_SRR0, 0xfff00100);
+       mtspr(SPRN_SRR1, 0);
        __asm__ __volatile__("rfi\n\t");
 
        /* not reached */
@@ -513,10 +513,10 @@ static __inline__ void k2_set_bat(void)
        mb();
 
        /* setup DBATs */
-       mtspr(DBAT2U, 0x80001ffe);
-       mtspr(DBAT2L, 0x8000002a);
-       mtspr(DBAT3U, 0xf0001ffe);
-       mtspr(DBAT3L, 0xf000002a);
+       mtspr(SPRN_DBAT2U, 0x80001ffe);
+       mtspr(SPRN_DBAT2L, 0x8000002a);
+       mtspr(SPRN_DBAT3U, 0xf0001ffe);
+       mtspr(SPRN_DBAT3L, 0xf000002a);
 
        /* wait for updates */
        mb();