Diff
Modified: trunk/arch/blackfin/include/asm/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/include/asm/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/include/asm/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -9,4 +9,79 @@
#include <mach/mem_map.h>
+#ifndef __ASSEMBLY__
+
+#ifdef CONFIG_SMP
+static inline ulong get_l1_scratch_start_cpu(int cpu)
+{
+ return (cpu) ? COREB_L1_SCRATCH_START : COREA_L1_SCRATCH_START;
+}
+static inline ulong get_l1_code_start_cpu(int cpu)
+{
+ return (cpu) ? COREB_L1_CODE_START : COREA_L1_CODE_START;
+}
+static inline ulong get_l1_data_a_start_cpu(int cpu)
+{
+ return (cpu) ? COREB_L1_DATA_A_START : COREA_L1_DATA_A_START;
+}
+static inline ulong get_l1_data_b_start_cpu(int cpu)
+{
+ return (cpu) ? COREB_L1_DATA_B_START : COREA_L1_DATA_B_START;
+}
+
+static inline ulong get_l1_scratch_start(void)
+{
+ return get_l1_scratch_start_cpu(blackfin_core_id());
+}
+static inline ulong get_l1_code_start(void)
+{
+ return get_l1_code_start_cpu(blackfin_core_id());
+}
+static inline ulong get_l1_data_a_start(void)
+{
+ return get_l1_data_a_start_cpu(blackfin_core_id());
+}
+static inline ulong get_l1_data_b_start(void)
+{
+ return get_l1_data_b_start_cpu(blackfin_core_id());
+}
+
+#else /* !CONFIG_SMP */
+
+static inline ulong get_l1_scratch_start_cpu(int cpu)
+{
+ return L1_SCRATCH_START;
+}
+static inline ulong get_l1_code_start_cpu(int cpu)
+{
+ return L1_CODE_START;
+}
+static inline ulong get_l1_data_a_start_cpu(int cpu)
+{
+ return L1_DATA_A_START;
+}
+static inline ulong get_l1_data_b_start_cpu(int cpu)
+{
+ return L1_DATA_B_START;
+}
+static inline ulong get_l1_scratch_start(void)
+{
+ return get_l1_scratch_start_cpu(0);
+}
+static inline ulong get_l1_code_start(void)
+{
+ return get_l1_code_start_cpu(0);
+}
+static inline ulong get_l1_data_a_start(void)
+{
+ return get_l1_data_a_start_cpu(0);
+}
+static inline ulong get_l1_data_b_start(void)
+{
+ return get_l1_data_b_start_cpu(0);
+}
+
+#endif /* CONFIG_SMP */
+#endif /* __ASSEMBLY__ */
+
#endif /* _MEM_MAP_H_ */
Modified: trunk/arch/blackfin/include/asm/system.h (5760 => 5761)
--- trunk/arch/blackfin/include/asm/system.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/include/asm/system.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -66,10 +66,13 @@
# define smp_mb() do { barrier(); smp_check_barrier(); smp_mark_barrier(); } while (0)
# define smp_rmb() do { barrier(); smp_check_barrier(); } while (0)
# define smp_wmb() do { barrier(); smp_mark_barrier(); } while (0)
+#define smp_read_barrier_depends() do { barrier(); smp_check_barrier(); } while (0)
+
#else
# define smp_mb() barrier()
# define smp_rmb() barrier()
# define smp_wmb() barrier()
+#define smp_read_barrier_depends() barrier()
#endif
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
@@ -120,8 +123,6 @@
((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \
(unsigned long)(n), sizeof(*(ptr))))
-#define smp_read_barrier_depends() smp_check_barrier()
-
#else /* !CONFIG_SMP */
#define smp_mb() barrier()
@@ -192,6 +193,7 @@
*/
#include <asm/l1layout.h>
+#include <asm/mem_map.h>
asmlinkage struct task_struct *resume(struct task_struct *prev, struct task_struct *next);
Modified: trunk/arch/blackfin/kernel/bfin_ksyms.c (5760 => 5761)
--- trunk/arch/blackfin/kernel/bfin_ksyms.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/kernel/bfin_ksyms.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -99,6 +99,8 @@
EXPORT_SYMBOL(__raw_bit_test_clear_asm);
EXPORT_SYMBOL(__raw_bit_test_toggle_asm);
EXPORT_SYMBOL(__raw_uncached_fetch_asm);
+#ifdef __ARCH_SYNC_CORE_DCACHE
EXPORT_SYMBOL(__raw_smp_mark_barrier_asm);
EXPORT_SYMBOL(__raw_smp_check_barrier_asm);
#endif
+#endif
Modified: trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c (5760 => 5761)
--- trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/kernel/cplb-mpu/cplbinit.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -25,6 +25,7 @@
#include <asm/blackfin.h>
#include <asm/cplb.h>
#include <asm/cplbinit.h>
+#include <asm/mem_map.h>
#if ANOMALY_05000263
# error the MPU will not function safely while Anomaly 05000263 applies
Modified: trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c (5760 => 5761)
--- trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -27,6 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/cplb.h>
#include <asm/cplbinit.h>
+#include <asm/mem_map.h>
u_long icplb_tables[NR_CPUS][CPLB_TBL_ENTRIES+1];
u_long dcplb_tables[NR_CPUS][CPLB_TBL_ENTRIES+1];
Modified: trunk/arch/blackfin/kernel/process.c (5760 => 5761)
--- trunk/arch/blackfin/kernel/process.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/kernel/process.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -39,6 +39,7 @@
#include <asm/blackfin.h>
#include <asm/fixed_code.h>
+#include <asm/mem_map.h>
asmlinkage void ret_from_fork(void);
Modified: trunk/arch/blackfin/kernel/ptrace.c (5760 => 5761)
--- trunk/arch/blackfin/kernel/ptrace.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/kernel/ptrace.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -45,6 +45,7 @@
#include <asm/asm-offsets.h>
#include <asm/dma.h>
#include <asm/fixed_code.h>
+#include <asm/mem_map.h>
#define TEXT_OFFSET 0
/*
Modified: trunk/arch/blackfin/mach-bf518/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf518/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf518/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -99,15 +99,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf527/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf527/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf527/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -99,15 +99,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf533/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf533/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf533/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -168,15 +168,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf537/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf537/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf537/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -176,15 +176,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf538/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf538/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf538/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -104,15 +104,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf548/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf548/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf548/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -108,15 +108,6 @@
#define L1_SCRATCH_START 0xFFB00000
#define L1_SCRATCH_LENGTH 0x1000
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-
#define GET_PDA_SAFE(preg) \
preg.l = _cpu_pda; \
preg.h = _cpu_pda;
Modified: trunk/arch/blackfin/mach-bf561/include/mach/mem_map.h (5760 => 5761)
--- trunk/arch/blackfin/mach-bf561/include/mach/mem_map.h 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mach-bf561/include/mach/mem_map.h 2008-11-28 16:18:36 UTC (rev 5761)
@@ -85,48 +85,8 @@
#define L1_SCRATCH_START COREA_L1_SCRATCH_START
#define L1_SCRATCH_LENGTH 0x1000
-#ifndef __ASSEMBLY__
+#ifdef __ASSEMBLY__
-#ifdef CONFIG_SMP
-
-#define get_l1_scratch_start_cpu(cpu) \
- ({ unsigned long __addr; \
- __addr = (cpu) ? COREB_L1_SCRATCH_START : COREA_L1_SCRATCH_START;\
- __addr; })
-
-#define get_l1_code_start_cpu(cpu) \
- ({ unsigned long __addr; \
- __addr = (cpu) ? COREB_L1_CODE_START : COREA_L1_CODE_START; \
- __addr; })
-
-#define get_l1_data_a_start_cpu(cpu) \
- ({ unsigned long __addr; \
- __addr = (cpu) ? COREB_L1_DATA_A_START : COREA_L1_DATA_A_START;\
- __addr; })
-
-#define get_l1_data_b_start_cpu(cpu) \
- ({ unsigned long __addr; \
- __addr = (cpu) ? COREB_L1_DATA_B_START : COREA_L1_DATA_B_START;\
- __addr; })
-
-#define get_l1_scratch_start() get_l1_scratch_start_cpu(blackfin_core_id())
-#define get_l1_code_start() get_l1_code_start_cpu(blackfin_core_id())
-#define get_l1_data_a_start() get_l1_data_a_start_cpu(blackfin_core_id())
-#define get_l1_data_b_start() get_l1_data_b_start_cpu(blackfin_core_id())
-
-#else /* !CONFIG_SMP */
-#define get_l1_scratch_start_cpu(cpu) L1_SCRATCH_START
-#define get_l1_code_start_cpu(cpu) L1_CODE_START
-#define get_l1_data_a_start_cpu(cpu) L1_DATA_A_START
-#define get_l1_data_b_start_cpu(cpu) L1_DATA_B_START
-#define get_l1_scratch_start() L1_SCRATCH_START
-#define get_l1_code_start() L1_CODE_START
-#define get_l1_data_a_start() L1_DATA_A_START
-#define get_l1_data_b_start() L1_DATA_B_START
-#endif /* !CONFIG_SMP */
-
-#else /* __ASSEMBLY__ */
-
/*
* The following macros both return the address of the PDA for the
* current core.
Modified: trunk/arch/blackfin/mm/sram-alloc.c (5760 => 5761)
--- trunk/arch/blackfin/mm/sram-alloc.c 2008-11-28 16:13:09 UTC (rev 5760)
+++ trunk/arch/blackfin/mm/sram-alloc.c 2008-11-28 16:18:36 UTC (rev 5761)
@@ -39,6 +39,7 @@
#include <linux/spinlock.h>
#include <linux/rtc.h>
#include <asm/blackfin.h>
+#include <asm/mem_map.h>
#include "blackfin_sram.h"
static DEFINE_PER_CPU(spinlock_t, l1sram_lock) ____cacheline_aligned_in_smp;
