瀏覽代碼

[Blackfin] arch: fix up - CONFIG_BLKFIN_WT was renamed CONFIG_BFIN_WT while the MPU code was out-of-tree.

Signed-off-by: Bernd Schmidt <bernds_cb1@t-online.de>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Bernd Schmidt 17 年之前
父節點
當前提交
dbfe44f02b
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      arch/blackfin/kernel/cplb-mpu/cplbinit.c
  2. 2 2
      arch/blackfin/kernel/cplb-mpu/cplbmgr.c

+ 1 - 1
arch/blackfin/kernel/cplb-mpu/cplbinit.c

@@ -49,7 +49,7 @@ void __init generate_cpl_tables(void)
 
 #ifdef CONFIG_BFIN_DCACHE
 	d_cache = CPLB_L1_CHBL;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
 	d_cache |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif

+ 2 - 2
arch/blackfin/kernel/cplb-mpu/cplbmgr.c

@@ -149,7 +149,7 @@ static noinline int dcplb_miss(void)
 	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
 	d_data |= CPLB_L1_CHBL | ANOMALY_05000158_WORKAROUND;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
 	d_data |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif
@@ -319,7 +319,7 @@ void set_mask_dcplbs(unsigned long *masks)
 	d_data = CPLB_SUPV_WR | CPLB_VALID | CPLB_DIRTY | PAGE_SIZE_4KB;
 #ifdef CONFIG_BFIN_DCACHE
 	d_data |= CPLB_L1_CHBL;
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
 	d_data |= CPLB_L1_AOW | CPLB_WT;
 #endif
 #endif