Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbfe44f0 authored Apr 23, 2008 by Bernd Schmidt Committed by Bryan Wu Apr 23, 2008

[Blackfin] arch: fix up - CONFIG_BLKFIN_WT was renamed CONFIG_BFIN_WT while...


[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>

parent b594272c

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,7 @@ void __init generate_cpl_tables(void)

	#ifdef CONFIG_BFIN_DCACHE		#ifdef CONFIG_BFIN_DCACHE
	d_cache = CPLB_L1_CHBL;		d_cache = CPLB_L1_CHBL;
	#ifdef CONFIG_BLKFIN_WT		#ifdef CONFIG_BFIN_WT
	d_cache \|= CPLB_L1_AOW \| CPLB_WT;		d_cache \|= CPLB_L1_AOW \| CPLB_WT;
	#endif		#endif
	#endif		#endif

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -149,7 +149,7 @@ static noinline int dcplb_miss(void)
	d_data = CPLB_SUPV_WR \| CPLB_VALID \| CPLB_DIRTY \| PAGE_SIZE_4KB;		d_data = CPLB_SUPV_WR \| CPLB_VALID \| CPLB_DIRTY \| PAGE_SIZE_4KB;
	#ifdef CONFIG_BFIN_DCACHE		#ifdef CONFIG_BFIN_DCACHE
	d_data \|= CPLB_L1_CHBL \| ANOMALY_05000158_WORKAROUND;		d_data \|= CPLB_L1_CHBL \| ANOMALY_05000158_WORKAROUND;
	#ifdef CONFIG_BLKFIN_WT		#ifdef CONFIG_BFIN_WT
	d_data \|= CPLB_L1_AOW \| CPLB_WT;		d_data \|= CPLB_L1_AOW \| CPLB_WT;
	#endif		#endif
	#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;		d_data = CPLB_SUPV_WR \| CPLB_VALID \| CPLB_DIRTY \| PAGE_SIZE_4KB;
	#ifdef CONFIG_BFIN_DCACHE		#ifdef CONFIG_BFIN_DCACHE
	d_data \|= CPLB_L1_CHBL;		d_data \|= CPLB_L1_CHBL;
	#ifdef CONFIG_BLKFIN_WT		#ifdef CONFIG_BFIN_WT
	d_data \|= CPLB_L1_AOW \| CPLB_WT;		d_data \|= CPLB_L1_AOW \| CPLB_WT;
	#endif		#endif
	#endif		#endif