summaryrefslogtreecommitdiff
path: root/arch/sh/kernel/cpu/sh4/probe.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-04-21 07:01:06 +0400
committerPaul Mundt <lethal@linux-sh.org>2010-04-21 07:01:06 +0400
commita9079ca0cb15feda15e7a380092e02d5cd834148 (patch)
treefc47ebb5c005b21aafd1149cab98af09ea247282 /arch/sh/kernel/cpu/sh4/probe.c
parent3bd16668872b5ad0afb22f15ef6c800a8faf7532 (diff)
downloadlinux-a9079ca0cb15feda15e7a380092e02d5cd834148.tar.xz
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/sh4/probe.c')
-rw-r--r--arch/sh/kernel/cpu/sh4/probe.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 822977a06d84..d180f16281ed 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -15,7 +15,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-int __init detect_cpu_and_cache_system(void)
+void __cpuinit cpu_probe(void)
{
unsigned long pvr, prr, cvr;
unsigned long size;
@@ -251,6 +251,4 @@ int __init detect_cpu_and_cache_system(void)
boot_cpu_data.scache.linesz);
}
}
-
- return 0;
}