Commit 2ad913ba authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

[SPARC64]: Fix section error in sparcspkr

With a sparc64 defconfig modified to set CONFIG_HOTPLUG=n
the following error happened during link of vmlinux:

local symbol 0: discarded in section `.devexit.text' from drivers/built-in.o
local symbol 1: discarded in section `.devexit.text' from drivers/built-in.o

(The error message above is from kbuild.git but it happens in mainline too)

The error happens becase there is a reference from .text/.data to a
function marked __devexit. With CONFIG_HOTPLUG=n all code marked
__devexit are discarded and the linker complains.

It was tracked down to sparcspkr.c which were missing __devexit_p()
around the function pointers.

Unfortunately modpost did not catch this since modpost do not warn
about references from .data to .devexit from variables named *_driver.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1f35ba3
...@@ -195,7 +195,7 @@ static struct of_platform_driver ebus_beep_driver = { ...@@ -195,7 +195,7 @@ static struct of_platform_driver ebus_beep_driver = {
.name = "beep", .name = "beep",
.match_table = ebus_beep_match, .match_table = ebus_beep_match,
.probe = ebus_beep_probe, .probe = ebus_beep_probe,
.remove = sparcspkr_remove, .remove = __devexit_p(sparcspkr_remove),
.shutdown = sparcspkr_shutdown, .shutdown = sparcspkr_shutdown,
}; };
...@@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = { ...@@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = {
.name = "beep", .name = "beep",
.match_table = isa_beep_match, .match_table = isa_beep_match,
.probe = isa_beep_probe, .probe = isa_beep_probe,
.remove = sparcspkr_remove, .remove = __devexit_p(sparcspkr_remove),
.shutdown = sparcspkr_shutdown, .shutdown = sparcspkr_shutdown,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment