diff options
author | Graf Yang <graf.yang@analog.com> | 2009-09-21 07:51:31 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-10 07:18:15 -0500 |
commit | 2c1657c29f810d0ba32cde54cba1e916815493e5 (patch) | |
tree | 882d54edf3f003868af78eb2a92a0782f0c1bfd7 /arch/blackfin/include/asm/processor.h | |
parent | 05c3457ec2d5d02aec58d246179df19d6b2de752 (diff) |
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: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include/asm/processor.h')
-rw-r--r-- | arch/blackfin/include/asm/processor.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h index aea880274de7..8af7772e84cc 100644 --- a/arch/blackfin/include/asm/processor.h +++ b/arch/blackfin/include/asm/processor.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | 14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) |
15 | 15 | ||
16 | #include <asm/ptrace.h> | 16 | #include <asm/ptrace.h> |
17 | #include <asm/blackfin.h> | 17 | #include <mach/blackfin.h> |
18 | 18 | ||
19 | static inline unsigned long rdusp(void) | 19 | static inline unsigned long rdusp(void) |
20 | { | 20 | { |
@@ -134,6 +134,8 @@ static inline uint32_t __pure bfin_dspid(void) | |||
134 | return bfin_read_DSPID(); | 134 | return bfin_read_DSPID(); |
135 | } | 135 | } |
136 | 136 | ||
137 | #define blackfin_core_id() (bfin_dspid() & 0xff) | ||
138 | |||
137 | static inline uint32_t __pure bfin_compiled_revid(void) | 139 | static inline uint32_t __pure bfin_compiled_revid(void) |
138 | { | 140 | { |
139 | #if defined(CONFIG_BF_REV_0_0) | 141 | #if defined(CONFIG_BF_REV_0_0) |