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

Commit 49fcc7b1 authored by Graf Yang's avatar Graf Yang Committed by Mike Frysinger
Browse files

Blackfin: bf561: fix mem_map.h SMP overrides 



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: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 75734e66

arch/blackfin/mach-bf561/include/mach/mem_map.h

+9 −7
Original line number Diff line number Diff line
@@ -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,7 +121,6 @@ 
 * 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)		\

	preg.l = lo(DSPID);		\

	preg.h = hi(DSPID);		\
@@ -176,6 +175,10 @@ 
	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 /* CONFIG_SMP */



# endif /* __ASSEMBLY__ */

#endif /* CONFIG_SMP */



#endif