From 5775229135b39d32f0dc560bc7c513fa95597a4c Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Wed, 23 Apr 2008 07:11:55 +0800 Subject: [PATCH] --- yaml --- r: 92279 b: refs/heads/master c: dbfe44f02b6855efb5a596e942ec2fd96d592f60 h: refs/heads/master i: 92277: 3bb6dd3857dc5f91d451a0f831d0a5f2184fba4b 92275: fb21c18e7102bc4b025f21e0f649780c67c8487e 92271: f904eda3ed4d88c7ef046d31feaef1ef948b44aa v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c | 2 +- trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 713397639086..39f149a02495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b594272c5e2837b6856b93520303c5981c852327 +refs/heads/master: dbfe44f02b6855efb5a596e942ec2fd96d592f60 diff --git a/trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c index dc6e8a7a8bda..7310e5fc6399 100644 --- a/trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c +++ b/trunk/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 diff --git a/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c index c426a22f9907..0a30d6256073 100644 --- a/trunk/arch/blackfin/kernel/cplb-mpu/cplbmgr.c +++ b/trunk/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