aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh3/probe.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-21 12:01:06 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-04-21 12:01:06 +0900
commita9079ca0cb15feda15e7a380092e02d5cd834148 (patch)
treefc47ebb5c005b21aafd1149cab98af09ea247282 /arch/sh/kernel/cpu/sh3/probe.c
parentsh: hw-breakpoints: Kill off stub unthrottle callback. (diff)
downloadlinux-dev-a9079ca0cb15feda15e7a380092e02d5cd834148.tar.xz
linux-dev-a9079ca0cb15feda15e7a380092e02d5cd834148.zip
sh: Tidy CPU probing and fixup section annotations.
This does a detect_cpu_and_cache_system() -> cpu_probe() rename, tidies up the unused return value, and stuffs it under __cpuinit in preparation for CPU hotplug. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/probe.c')
-rw-r--r--arch/sh/kernel/cpu/sh3/probe.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 295ec4c99e98..bf23c322e164 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,7 +16,7 @@
#include <asm/cache.h>
#include <asm/io.h>
-int detect_cpu_and_cache_system(void)
+void __cpuinit cpu_probe(void)
{
unsigned long addr0, addr1, data0, data1, data2, data3;
@@ -108,6 +108,4 @@ int detect_cpu_and_cache_system(void)
boot_cpu_data.icache = boot_cpu_data.dcache;
boot_cpu_data.family = CPU_FAMILY_SH3;
-
- return 0;
}