summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-03-04 15:09:05 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-19 19:10:23 -0700
commit6c847402e1c69c1cfe2bddeadc8391bacbb3d0a5 (patch)
treef807ab8139202761e9968f430d97813c787c680a /drivers/base
parent35d313b8744dc64c31b9cfcdb083112937643b45 (diff)
downloadlinux-3.10-6c847402e1c69c1cfe2bddeadc8391bacbb3d0a5.tar.gz
linux-3.10-6c847402e1c69c1cfe2bddeadc8391bacbb3d0a5.tar.bz2
linux-3.10-6c847402e1c69c1cfe2bddeadc8391bacbb3d0a5.zip
driver core: cpu: fix section mismatch in cpu.c:store_online
Fix following warning: WARNING: vmlinux.o(.text+0x64609c): Section mismatch in reference from the function store_online() to the function .cpuinit.text:cpu_up() store_online() is defined inside a HOTPLUG_CPU block so references are OK. Ignore references by annotating store_online() with __ref. Note: This is needed because cpu_up() most likely should not have been __cpuinit but all the hotplug cpu code misuses the __cpuinit annotation. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/cpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 499b003f927..3e417a97681 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -28,7 +28,7 @@ static ssize_t show_online(struct sys_device *dev, char *buf)
return sprintf(buf, "%u\n", !!cpu_online(cpu->sysdev.id));
}
-static ssize_t store_online(struct sys_device *dev, const char *buf,
+static ssize_t __ref store_online(struct sys_device *dev, const char *buf,
size_t count)
{
struct cpu *cpu = container_of(dev, struct cpu, sysdev);
@@ -55,7 +55,7 @@ static ssize_t store_online(struct sys_device *dev, const char *buf,
}
static SYSDEV_ATTR(online, 0644, show_online, store_online);
-static void __devinit register_cpu_control(struct cpu *cpu)
+static void __cpuinit register_cpu_control(struct cpu *cpu)
{
sysdev_create_file(&cpu->sysdev, &attr_online);
}