diff options
author | Graf Yang <graf.yang@analog.com> | 2009-01-07 10:14:39 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 10:14:39 -0500 |
commit | dbc895f95500a73ebf1ff12fe85f2e2b3790f52f (patch) | |
tree | 8b60024a7725c559767295b2b3ef143a39111f8b /arch/blackfin/mach-bf561/smp.c | |
parent | f994607a2e118aedf1116a58ecd16126dbb83d28 (diff) |
Blackfin arch: smp patch cleanup from LKML review
1. Use inline get_l1_... functions instead of macro
2. Fix compile issue about smp barrier functions
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf561/smp.c')
-rw-r--r-- | arch/blackfin/mach-bf561/smp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c index 23fd4c13897f..9b27e698c0b2 100644 --- a/arch/blackfin/mach-bf561/smp.c +++ b/arch/blackfin/mach-bf561/smp.c | |||
@@ -27,11 +27,6 @@ | |||
27 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
28 | #include <asm/dma.h> | 28 | #include <asm/dma.h> |
29 | 29 | ||
30 | #define COREB_SRAM_BASE 0xff600000 | ||
31 | #define COREB_SRAM_SIZE 0x4000 | ||
32 | |||
33 | extern char coreb_trampoline_start, coreb_trampoline_end; | ||
34 | |||
35 | static DEFINE_SPINLOCK(boot_lock); | 30 | static DEFINE_SPINLOCK(boot_lock); |
36 | 31 | ||
37 | static cpumask_t cpu_callin_map; | 32 | static cpumask_t cpu_callin_map; |
@@ -54,15 +49,15 @@ void __init platform_prepare_cpus(unsigned int max_cpus) | |||
54 | int len; | 49 | int len; |
55 | 50 | ||
56 | len = &coreb_trampoline_end - &coreb_trampoline_start + 1; | 51 | len = &coreb_trampoline_end - &coreb_trampoline_start + 1; |
57 | BUG_ON(len > COREB_SRAM_SIZE); | 52 | BUG_ON(len > L1_CODE_LENGTH); |
58 | 53 | ||
59 | dma_memcpy((void *)COREB_SRAM_BASE, &coreb_trampoline_start, len); | 54 | dma_memcpy((void *)COREB_L1_CODE_START, &coreb_trampoline_start, len); |
60 | 55 | ||
61 | /* Both cores ought to be present on a bf561! */ | 56 | /* Both cores ought to be present on a bf561! */ |
62 | cpu_set(0, cpu_present_map); /* CoreA */ | 57 | cpu_set(0, cpu_present_map); /* CoreA */ |
63 | cpu_set(1, cpu_present_map); /* CoreB */ | 58 | cpu_set(1, cpu_present_map); /* CoreB */ |
64 | 59 | ||
65 | printk(KERN_INFO "CoreB bootstrap code to SRAM %p via DMA.\n", (void *)COREB_SRAM_BASE); | 60 | printk(KERN_INFO "CoreB bootstrap code to SRAM %p via DMA.\n", (void *)COREB_L1_CODE_START); |
66 | } | 61 | } |
67 | 62 | ||
68 | int __init setup_profiling_timer(unsigned int multiplier) /* not supported */ | 63 | int __init setup_profiling_timer(unsigned int multiplier) /* not supported */ |