leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blackfin: SMP: relocate blackfin_core_id() definition

Browse Source 
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: 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 05c3457ec2
commit 2c1657c29f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/blackfin/include/asm/irqflags.h
View File

@ -13,9 +13,6 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
# include <asm/pda.h> # include <asm/pda.h>
# include <asm/processor.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 # define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
#else #else
extern unsigned long bfin_irq_flags; extern unsigned long bfin_irq_flags;

4
arch/blackfin/include/asm/processor.h
View File

@ -14,7 +14,7 @@
#define current_text_addr() ({ __label__ _l; _l: &&_l;}) #define current_text_addr() ({ __label__ _l; _l: &&_l;})
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/blackfin.h> #include <mach/blackfin.h>
static inline unsigned long rdusp(void) static inline unsigned long rdusp(void)
{ {
@ -134,6 +134,8 @@ static inline uint32_t __pure bfin_dspid(void)
return bfin_read_DSPID(); return bfin_read_DSPID();
} }
#define blackfin_core_id() (bfin_dspid() & 0xff)
static inline uint32_t __pure bfin_compiled_revid(void) static inline uint32_t __pure bfin_compiled_revid(void)
{ {
#if defined(CONFIG_BF_REV_0_0) #if defined(CONFIG_BF_REV_0_0)