aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-09-21 18:01:40 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-09-21 18:01:40 +0900
commit2d4a73d5b91528322631830784f4eb7897fb5e41 (patch)
tree19a61cc5ed80c0c3488197aec9539b602b50c4ad
parent00765c816a6396e2bb3c6588019bda1508b62f6a (diff)
sh: Kill off special boot_cpu_data.
This consolidates the cpu_data definitions and gets rid of the special boot_cpu_data. It's made a wrapper to the boot CPU, in order to keep the existing in-tree users happy. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/setup.c8
-rw-r--r--arch/sh/kernel/sh_ksyms.c1
-rw-r--r--include/asm-sh/processor.h9
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index e0e655cba89..cd69b57488d 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -42,7 +42,13 @@ extern void * __rd_start, * __rd_end;
* This value will be used at the very early stage of serial setup.
* The bigger value means no problem.
*/
-struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
+struct sh_cpuinfo cpu_data[NR_CPUS] __read_mostly = {
+ [0] = {
+ .type = CPU_SH_NONE,
+ .loops_per_jiffy = 10000000,
+ },
+};
+EXPORT_SYMBOL(cpu_data);
/*
* The machine vector. First entry in .machvec.init, or clobbered by
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 89362e05cc4..cac7380ed0b 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -43,7 +43,6 @@ EXPORT_SYMBOL(memcpy);
EXPORT_SYMBOL(memset);
EXPORT_SYMBOL(memmove);
EXPORT_SYMBOL(__copy_user);
-EXPORT_SYMBOL(boot_cpu_data);
#ifdef CONFIG_MMU
EXPORT_SYMBOL(get_vm_area);
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 56cb3c89f84..4f2922a1979 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -73,15 +73,10 @@ struct sh_cpuinfo {
unsigned long flags;
} __attribute__ ((aligned(SMP_CACHE_BYTES)));
-extern struct sh_cpuinfo boot_cpu_data;
-
-#ifdef CONFIG_SMP
extern struct sh_cpuinfo cpu_data[];
+#define boot_cpu_data cpu_data[0]
#define current_cpu_data cpu_data[smp_processor_id()]
-#else
-#define cpu_data (&boot_cpu_data)
-#define current_cpu_data boot_cpu_data
-#endif
+#define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
/*
* User space process size: 2GB.