Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / arch / sh / kernel / cpu / sh3 / probe.c

diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index f9c7df6..295ec4c 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,7 +16,7 @@
 #include <asm/cache.h>
 #include <asm/io.h>
 
-int __uses_jump_to_uncached detect_cpu_and_cache_system(void)
+int detect_cpu_and_cache_system(void)
 {
        unsigned long addr0, addr1, data0, data1, data2, data3;
 
@@ -30,23 +30,23 @@ int __uses_jump_to_uncached detect_cpu_and_cache_system(void)
        addr1 = CACHE_OC_ADDRESS_ARRAY + (1 << 12);
 
        /* First, write back & invalidate */
-       data0  = ctrl_inl(addr0);
-       ctrl_outl(data0&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr0);
-       data1  = ctrl_inl(addr1);
-       ctrl_outl(data1&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr1);
+       data0  = __raw_readl(addr0);
+       __raw_writel(data0&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr0);
+       data1  = __raw_readl(addr1);
+       __raw_writel(data1&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr1);
 
        /* Next, check if there's shadow or not */
-       data0 = ctrl_inl(addr0);
+       data0 = __raw_readl(addr0);
        data0 ^= SH_CACHE_VALID;
-       ctrl_outl(data0, addr0);
-       data1 = ctrl_inl(addr1);
+       __raw_writel(data0, addr0);
+       data1 = __raw_readl(addr1);
        data2 = data1 ^ SH_CACHE_VALID;
-       ctrl_outl(data2, addr1);
-       data3 = ctrl_inl(addr0);
+       __raw_writel(data2, addr1);
+       data3 = __raw_readl(addr0);
 
        /* Lastly, invaliate them. */
-       ctrl_outl(data0&~SH_CACHE_VALID, addr0);
-       ctrl_outl(data2&~SH_CACHE_VALID, addr1);
+       __raw_writel(data0&~SH_CACHE_VALID, addr0);
+       __raw_writel(data2&~SH_CACHE_VALID, addr1);
 
        back_to_cached();
 
@@ -94,9 +94,9 @@ int __uses_jump_to_uncached detect_cpu_and_cache_system(void)
                boot_cpu_data.dcache.way_incr   = (1 << 13);
                boot_cpu_data.dcache.entry_mask = 0x1ff0;
                boot_cpu_data.dcache.sets       = 512;
-               ctrl_outl(CCR_CACHE_32KB, CCR3_REG);
+               __raw_writel(CCR_CACHE_32KB, CCR3_REG);
 #else
-               ctrl_outl(CCR_CACHE_16KB, CCR3_REG);
+               __raw_writel(CCR_CACHE_16KB, CCR3_REG);
 #endif
 #endif
        }