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

Commit 2c1657c2 authored by Graf Yang's avatar Graf Yang Committed by Mike Frysinger
Browse files

Blackfin: SMP: relocate blackfin_core_id() definition 



Since we're breaking apart some inter-header dependencies to avoid more
circular loops, move the blackfin_core_id() definition to the func that
it is based upon.

Signed-off-by: default avatarGraf Yang <graf.yang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 05c3457e

arch/blackfin/include/asm/irqflags.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#ifdef CONFIG_SMP

# include <asm/pda.h>

# include <asm/processor.h>

/* Forward decl needed due to cdef inter dependencies */

static inline uint32_t __pure bfin_dspid(void);

# define blackfin_core_id() (bfin_dspid() & 0xff)

# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask

#else

extern unsigned long bfin_irq_flags;

arch/blackfin/include/asm/processor.h

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define current_text_addr() ({ __label__ _l; _l: &&_l;})



#include <asm/ptrace.h>

#include <asm/blackfin.h>

#include <mach/blackfin.h>



static inline unsigned long rdusp(void)

{
@@ -134,6 +134,8 @@ static inline uint32_t __pure bfin_dspid(void) 
	return bfin_read_DSPID();

}



#define blackfin_core_id() (bfin_dspid() & 0xff)



static inline uint32_t __pure bfin_compiled_revid(void)

{

#if defined(CONFIG_BF_REV_0_0)