drivers/isdn/gigaset/: build asyncdata.o into the gigaset module
PATCH 1/1 drivers/isdn/gigaset/: build asyncdata.o into the gigaset module
This patch fixes the following compile error:
<-- snip -->
...
LD drivers/isdn/gigaset/built-in.odrivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition of gigaset_m10x_send_skb' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here drivers/isdn/gigaset/ser_gigaset.o: In function gigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1
<-- snip -->
---
drivers/isdn/gigaset/Makefile | 6 +++--- drivers/isdn/gigaset/asyncdata.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/isdn/gigaset/Makefile renamed from drivers/isdn/gigaset/Makefile.old +3 -3
@@ -1,7 +1,7 @@ -gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o -usb_gigaset-y := usb-gigaset.o asyncdata.o +gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o asyncdata.o +usb_gigaset-y := usb-gigaset.o bas_gigaset-y := bas-gigaset.o isocdata.o -ser_gigaset-y := ser-gigaset.o asyncdata.o +ser_gigaset-y := ser-gigaset.o obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
drivers/isdn/gigaset/asyncdata.c renamed from drivers/isdn/gigaset/asyncdata.c.old +2 -0
@@ -444,6 +444,7 @@atomic_set (&inbuf->head, head); } } +EXPORT_SYMBOL_GPL (gigaset_m10x_input);/* == data output ========================================================== */
@@ -591,3 +592,4 @@return len;/* ok so far */ } +EXPORT_SYMBOL_GPL (gigaset_m10x_send_skb);
Am 15.02.2007 22:56 schrieb Adrian Bunk:
Quoted 4 lines
This patch fixes the following compile error:
<-- snip -->
Quoted 9 lines
...
LDdrivers/isdn/gigaset/built-in.odrivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition ofgigaset_m10x_send_skb' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here drivers/isdn/gigaset/ser_gigaset.o: In functiongigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1
How did you manage to produce that error? I have never encountered it.
Thanks,
Tilman
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Quoted 15 lines · Tilman Schmidt
Am 15.02.2007 22:56 schrieb Adrian Bunk:
Quoted 4 lines
This patch fixes the following compile error:
<-- snip -->
Quoted 9 lines
...
LDdrivers/isdn/gigaset/built-in.odrivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition ofgigaset_m10x_send_skb' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here drivers/isdn/gigaset/ser_gigaset.o: In functiongigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1
Quoted 1 line
How did you manage to produce that error? I have never encountered it.
CONFIG_ISDN_DRV_GIGASET=yCONFIG_GIGASET_BASE=yCONFIG_GIGASET_M105=yCONFIG_GIGASET_M101=yCONFIG_GIGASET_DEBUG=yCONFIG_GIGASET_UNDOCREQ=y
It might depend on the binutils version.
Quoted 2 lines
Thanks,
Tilman
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedKbuild problem (was: [2.6 patch] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module)
Am 16.02.2007 09:33 schrieb Adrian Bunk:
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
...
LDdrivers/isdn/gigaset/built-in.odrivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition ofgigaset_m10x_send_skb' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here drivers/isdn/gigaset/ser_gigaset.o: In functiongigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1
Quoted 4 lines
CONFIG_ISDN_DRV_GIGASET=yCONFIG_GIGASET_BASE=yCONFIG_GIGASET_M105=yCONFIG_GIGASET_M101=y
Ah, thanks, I can see what's happening now. When both the M101 and M105 drivers are built into the kernel, asyncdata.o gets linked in twice, via
usb_gigaset-y := usb-gigaset.o asyncdata.o obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o
and
ser_gigaset-y := ser-gigaset.o asyncdata.o obj-$(CONFIG_GIGASET_M101) += ser_gigaset.o gigaset.o
The assertion in Documentation/kbuild/makefiles.txt:
The order of files in $(obj-y) is significant. Duplicates in the lists are allowed: the first instance will be linked into built-in.o and succeeding instances will be ignored.
doesn't work out in this case because asyncdata.o isn't added directly to $(obj-y), but as part of usb_gigaset.o and ser_gigaset.o.
I'm not quite happy with your solution, though. I'd prefer a Makefile which builds modular usb_gigaset.ko and/or ser_gigaset.ko like the present one (including asyncdata.o), but when linking usb-gigaset.o and ser-gigaset.o into the kernel includes asyncdata.o only once. Trouble is, I don't know how to express that in Kbuild.
Any ideas?
Thanks,
Tilman
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Re: Kbuild problem (was: [2.6 patch] drivers/isdn/gigaset/: build asyncdata.o into the gigaset module)
Quoted 36 lines · Tilman Schmidt
Am 16.02.2007 09:33 schrieb Adrian Bunk:
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
...
LDdrivers/isdn/gigaset/built-in.odrivers/isdn/gigaset/ser_gigaset.o: In function `gigaset_m10x_send_skb':
(.text+0xe50): multiple definition ofgigaset_m10x_send_skb' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x0): first defined here drivers/isdn/gigaset/ser_gigaset.o: In functiongigaset_m10x_input':
(.text+0x1121): multiple definition of `gigaset_m10x_input' drivers/isdn/gigaset/usb_gigaset.o:(.text+0x2d1): first defined here make[4]: *** [drivers/isdn/gigaset/built-in.o] Error 1Quoted 4 lines
CONFIG_ISDN_DRV_GIGASET=yCONFIG_GIGASET_BASE=yCONFIG_GIGASET_M105=yCONFIG_GIGASET_M101=yAh, thanks, I can see what's happening now. When both the M101 and M105 drivers are built into the kernel, asyncdata.o gets linked in twice, via
usb_gigaset-y := usb-gigaset.o asyncdata.o obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.oand
ser_gigaset-y := ser-gigaset.o asyncdata.o obj-$(CONFIG_GIGASET_M101) += ser_gigaset.o gigaset.oThe assertion in
Documentation/kbuild/makefiles.txt:The order of files in $(obj-y) is significant. Duplicates in the lists are allowed: the first instance will be linked into built-in.o and succeeding instances will be ignored.
doesn't work out in this case because asyncdata.o isn't added directly to $(obj-y), but as part of usb_gigaset.o and ser_gigaset.o.
Quoted 7 lines
I'm not quite happy with your solution, though. I'd prefer a
Makefilewhich builds modular usb_gigaset.ko and/or ser_gigaset.ko like the present one (including asyncdata.o), but when linking usb-gigaset.o and ser-gigaset.o into the kernel includes asyncdata.o only once. Trouble is, I don't know how to express that inKbuild.Any ideas?
CONFIG_GIGASET_M105=y, CONFIG_GIGASET_M101=m and similar problems might make this quite tricky.
Shared functionality simply doesn't belong into any of the affected modules, but to a different place where all users can access it.
Quoted 2 lines
Thanks,
Tilman
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: Kbuild problem
Am 17.02.2007 11:52 schrieb Adrian Bunk:
Quoted 11 lines · Tilman Schmidt
Quoted 7 lines
[...] I'd prefer a
Makefilewhich builds modular usb_gigaset.ko and/or ser_gigaset.ko like the present one (including asyncdata.o), but when linking usb-gigaset.o and ser-gigaset.o into the kernel includes asyncdata.o only once. Trouble is, I don't know how to express that inKbuild.Any ideas?
CONFIG_GIGASET_M105=y,CONFIG_GIGASET_M101=mand similar problems might make this quite tricky.
I am no judge of that. All I know about the possibilities of Kbuild is what the files in Documentation/kbuild tell me. From browsing through other kernel Makefiles it would appear that there are more possibilities though, such as if/then/else constructs.
Quoted 2 lines
Shared functionality simply doesn't belong into any of the affected modules, but to a different place where all users can access it.
Alright, then so be it. But that raises another question:
asyncdata.o is only needed for M105 and M101, not for the base driver. How do I express in Kbuild that asyncdata.o is to be added to gigaset-y only if CONFIG_GIGASET_M105 and CONFIG_GIGASET_M101 are not both 'n'?
Thanks,
Tilman
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Re: Kbuild problem
Quoted 5 lines · Tilman Schmidt
Alright, then so be it. But that raises another question:
asyncdata.o is only needed for M105 and M101, not for the base driver. How do I express inKbuildthat asyncdata.o is to be added to gigaset-y only ifCONFIG_GIGASET_M105andCONFIG_GIGASET_M101are not both 'n'?
The way this is typically done is via Kconfig. Add a config option ASYNCDATA (actually something more descriptive/specific would be better), add a "select ASYNCDATA" to the config options for m101 and m105, and then you can use CONFIG_ASYNCDATA to decide whether to add asyncdata.o in the Makefile.
--Kai
Re: Kbuild problem
Quoted 8 lines · Kai Germaschewski
Quoted 5 lines · Tilman Schmidt
Alright, then so be it. But that raises another question:
asyncdata.o is only needed for M105 and M101, not for the base driver. How do I express inKbuildthat asyncdata.o is to be added to gigaset-y only ifCONFIG_GIGASET_M105andCONFIG_GIGASET_M101are not both 'n'?
Quoted 5 lines
The way this is typically done is via
Kconfig. Add a config option ASYNCDATA (actually something more descriptive/specific would be better), add a "select ASYNCDATA" to the config options for m101 and m105, and then you can useCONFIG_ASYNCDATAto decide whether to add asyncdata.o in theMakefile.
One disadvantage of this approach is that in a kernel with CONFIG_GIGASET_BASE=y, you can't later compile and load the usb_gigaset or ser_gigaset modules without rebooting since they require a change to the kernel image.
Quoted 1 line
--Kai
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: Kbuild problem
Quoted 14 lines · Adrian Bunk
Quoted 7 lines · Kai Germaschewski
Quoted 4 lines · Tilman Schmidt
asyncdata.o is only needed for M105 and M101, not for the base driver. How do I express in
Kbuildthat asyncdata.o is to be added to gigaset-y only ifCONFIG_GIGASET_M105andCONFIG_GIGASET_M101are not both 'n'?Quoted 5 lines
The way this is typically done is via
Kconfig. Add a config option ASYNCDATA (actually something more descriptive/specific would be better), add a "select ASYNCDATA" to the config options for m101 and m105, and then you can useCONFIG_ASYNCDATAto decide whether to add asyncdata.o in theMakefile.
Quoted 4 lines
One disadvantage of this approach is that in a kernel with
CONFIG_GIGASET_BASE=y, you can't later compile and load theusb_gigasetorser_gigasetmodules without rebooting since they require a change to the kernel image.
You've got a point there. So linking asyncdata.o into the modules that need it, as it is currently done, would perhaps be better after all? The original problem (asyncdata.o linked in twice, causing duplicate symbol definitions) could be fixed with this (admittedly somewhat awkward) change to the Makefile (build tested):
drivers/isdn/gigaset/Makefile 2007-02-20 13:38:58.000000000 +0100 renamed from drivers/isdn/gigaset/Makefile 2007-02-20 13:39:44.000000000 +0100 +4 -1
@@ -1,7 +1,10 @@ gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o usb_gigaset-y := usb-gigaset.o asyncdata.o bas_gigaset-y := bas-gigaset.o isocdata.o -ser_gigaset-y := ser-gigaset.o asyncdata.o +ser_gigaset-y := ser-gigaset.o +ifneq ($(CONFIG_GIGASET_M101)$(CONFIG_GIGASET_M105),yy) +ser_gigaset-y += asyncdata.o +endif obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.o
The alternative would be to always link asyncdata.o into the gigaset module whether it's needed or not. "size asyncdata.o" says:
text data bss dec hex filename
4200 0 0 4200 1068 asyncdata.o
which appears tolerable.
Opinions?
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)
Re: Kbuild problem
Quoted 7 lines · Tilman Schmidt
Quoted 4 lines
One disadvantage of this approach is that in a kernel with
CONFIG_GIGASET_BASE=y, you can't later compile and load theusb_gigasetorser_gigasetmodules without rebooting since they require a change to the kernel image.You've got a point there. So linking asyncdata.o into the modules that need it, as it is currently done, would perhaps be better after all?
From the architectural point of view, what odds against making it a module of its own? Dependancies are resolved by modprobe, so users should be fine.
There are other library-like parts in the kernel where an object is built statically when at least one needing driver is static, a module when all nedding drivers are modules, or not at all but appears are a config option when no in-kernel driver needs it.
Quoted 6 lines
The alternative would be to always link asyncdata.o into the gigaset module whether it's needed or not. "size asyncdata.o" says:
text data bss dec hex filename
4200 0 0 4200 1068 asyncdata.o
which appears tolerable.
Ugly. But I've seen worse.
Bye,
Joerg
Re: Kbuild problem
In reply to Tilman SchmidtQuoted 29 lines · Tilman Schmidt
Quoted 14 lines · Adrian Bunk
Quoted 7 lines · Kai Germaschewski
Quoted 4 lines · Tilman Schmidt
asyncdata.o is only needed for M105 and M101, not for the base driver. How do I express in
Kbuildthat asyncdata.o is to be added to gigaset-y only ifCONFIG_GIGASET_M105andCONFIG_GIGASET_M101are not both 'n'?Quoted 5 lines
The way this is typically done is via
Kconfig. Add a config option ASYNCDATA (actually something more descriptive/specific would be better), add a "select ASYNCDATA" to the config options for m101 and m105, and then you can useCONFIG_ASYNCDATAto decide whether to add asyncdata.o in theMakefile.Quoted 4 lines
One disadvantage of this approach is that in a kernel with
CONFIG_GIGASET_BASE=y, you can't later compile and load theusb_gigasetorser_gigasetmodules without rebooting since they require a change to the kernel image.You've got a point there. So linking asyncdata.o into the modules that need it, as it is currently done, would perhaps be better after all? The original problem (asyncdata.o linked in twice, causing duplicate symbol definitions) could be fixed with this (admittedly somewhat awkward) change to the
Makefile(build tested):
drivers/isdn/gigaset/Makefile 2007-02-20 13:38:58.000000000 +0100 line 7
Quoted 8 lines
drivers/isdn/gigaset/Makefile 2007-02-20 13:38:58.000000000 +0100 renamed from drivers/isdn/gigaset/Makefile 2007-02-20 13:39:44.000000000 +0100 +4
-1@@ -1,7 +1,10 @@ gigaset-y := common.o interface.o proc.o ev-layer.o i4l.o usb_gigaset-y := usb-gigaset.o asyncdata.o bas_gigaset-y := bas-gigaset.o isocdata.o -ser_gigaset-y := ser-gigaset.o asyncdata.o +ser_gigaset-y := ser-gigaset.o +ifneq ($(CONFIG_GIGASET_M101)$(CONFIG_GIGASET_M105),yy) +ser_gigaset-y += asyncdata.o +endif
What happens with CONFIG_GIGASET_M101=y, CONFIG_GIGASET_M105=m ?
Quoted 10 lines
drivers/isdn/gigaset/Makefile 2007-02-20 13:38:58.000000000 +0100 renamed from drivers/isdn/gigaset/Makefile 2007-02-20 13:39:44.000000000 +0100 +0
-0obj-$(CONFIG_GIGASET_M105) += usb_gigaset.o gigaset.o obj-$(CONFIG_GIGASET_BASE) += bas_gigaset.o gigaset.oThe alternative would be to always link asyncdata.o into the gigaset module whether it's needed or not. "size asyncdata.o" says:
text data bss dec hex filename
4200 0 0 4200 1068 asyncdata.o
which appears tolerable.Opinions?
I'm usually someone who likes to avoid including unneeded code in the kernel, but in this case I'd say KISS - and build it always into the gigaset module.
Quoted 1 line
Tilman Schmidt
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: Kbuild problem
Am 20.02.2007 15:59 schrieb Adrian Bunk:
Quoted 3 lines
I'm usually someone who likes to avoid including unneeded code in the kernel, but in this case I'd say KISS - and build it always into the gigaset module.
There seems to be a clear majority for this solution. So KISS it will be. Thanks for all the advice. I'll do a new patch.
Signature · 4 lines
Tilman Schmidt E-Mail: [email protected] Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite)