AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Blackfin: bf561: fix mem_map.h SMP overrides

Browse Source 
The BF561 mem_map.h header has the __ASSEMBLY__/CONFIG_SMP checks out
of order which leads to build errors for assembly code that happens to
include this file.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Graf Yang 2009-09-21 11:51:31 +00:00 committed by Mike Frysinger
parent 75734e6606
commit 49fcc7b16f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/blackfin/mach-bf561/include/mach/mem_map.h
View File

@ -106,7 +106,7 @@
#define COREA_L1_SCRATCH_START 0xFFB00000
#define COREB_L1_SCRATCH_START 0xFF700000
#ifdef __ASSEMBLY__
#ifdef CONFIG_SMP
/*
* The following macros both return the address of the PDA for the
@ -121,8 +121,7 @@
* is allowed to use the specified Dreg for determining the PDA
* address to be returned into Preg.
*/
#ifdef CONFIG_SMP
#define GET_PDA_SAFE(preg) \
# define GET_PDA_SAFE(preg) \
preg.l = lo(DSPID); \
preg.h = hi(DSPID); \
preg = [preg]; \
@ -158,7 +157,7 @@
preg = [preg]; \
4:
#define GET_PDA(preg, dreg) \
# define GET_PDA(preg, dreg) \
preg.l = lo(DSPID); \
preg.h = hi(DSPID); \
dreg = [preg]; \
@ -169,13 +168,17 @@
preg = [preg]; \
1: \
#define GET_CPUID(preg, dreg) \
# define GET_CPUID(preg, dreg) \
preg.l = lo(DSPID); \
preg.h = hi(DSPID); \
dreg = [preg]; \
dreg = ROT dreg BY -1; \
dreg = CC;
# ifndef __ASSEMBLY__
# include <asm/processor.h>
static inline unsigned long get_l1_scratch_start_cpu(int cpu)
{
return cpu ? COREB_L1_SCRATCH_START : COREA_L1_SCRATCH_START;
@ -210,8 +213,7 @@ static inline unsigned long get_l1_data_b_start(void)
return get_l1_data_b_start_cpu(blackfin_core_id());
}
# endif /* __ASSEMBLY__ */
#endif /* CONFIG_SMP */
#endif /* __ASSEMBLY__ */
#endif