Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c96bcf958c1d79d8e8aa58722273ec7b1ffb815c
Commit:     c96bcf958c1d79d8e8aa58722273ec7b1ffb815c
Parent:     0b2328bbc08ee8f7377f9dccdd6fb0c707b34d2f
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 21 16:04:12 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 13:18:52 2008 +0900

    sh: Use existing CONFIG_CACHE_xx options in head_64.S.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/head_64.S |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S
index c969db5..d347928 100644
--- a/arch/sh/kernel/head_64.S
+++ b/arch/sh/kernel/head_64.S
@@ -63,23 +63,23 @@
 #define MMUDR_CACHED_L 0x000000000000015a | ALIGNED_PHYSICAL
                        /* 512 Mb, Cacheable, Write-back, read/write, Not User, 
Ph. Add. */
 
-#ifdef CONFIG_ICACHE_DISABLED
+#ifdef CONFIG_CACHE_OFF
 #define        ICCR0_INIT_VAL  ICCR0_OFF                       /* ICACHE off */
 #else
 #define        ICCR0_INIT_VAL  ICCR0_ON | ICCR0_ICI            /* ICE + ICI */
 #endif
 #define        ICCR1_INIT_VAL  ICCR1_NOLOCK                    /* No locking */
 
-#if defined (CONFIG_DCACHE_DISABLED)
+#if defined (CONFIG_CACHE_OFF)
 #define        OCCR0_INIT_VAL  OCCR0_OFF                          /* D-cache: 
off  */
-#elif defined (CONFIG_DCACHE_WRITE_THROUGH)
+#elif defined (CONFIG_CACHE_WRITETHROUGH)
 #define        OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WT    /* D-cache: 
on,   */
                                                           /* WT, invalidate */
-#elif defined (CONFIG_DCACHE_WRITE_BACK)
+#elif defined (CONFIG_CACHE_WRITEBACK)
 #define        OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WB    /* D-cache: 
on,   */
                                                           /* WB, invalidate */
 #else
-#error preprocessor flag CONFIG_DCACHE_... not recognized!
+#error preprocessor flag CONFIG_CACHE_... not recognized!
 #endif
 
 #define        OCCR1_INIT_VAL  OCCR1_NOLOCK                       /* No 
locking     */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to