Skip to content

Commit

Permalink
Blackfin: SMP: relocate blackfin_core_id() definition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Graf Yang authored and Mike Frysinger committed Jan 10, 2011
1 parent 05c3457 commit 2c1657c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 0 additions & 3 deletions arch/blackfin/include/asm/irqflags.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion arch/blackfin/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 2c1657c

Please sign in to comment.