Re: [PATCH] 2.6.24-mm1 section type conflict cleanup

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* Re: [PATCH] 2.6.24-mm1 section type conflict cleanup
       [not found] <20080203171634.58ab668b.akpm@linux-foundation.org>
@ 2008-02-04 16:22 ` Kamalesh Babulal
  2008-02-04 18:04   ` Sam Ravnborg
       [not found] ` <47A79291.5010204@imap.cc>
  1 sibling, 1 reply; 5+ messages in thread
From: Kamalesh Babulal @ 2008-02-04 16:22 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel, netdev, sam, apw, balbir

Hi Andrew,

The 2.6.24-mm1 kernel build fails at many places with section type
conflict build error.

drivers/net/typhoon.c:181: error: typhoon_card_info causes a section type conflict
make[2]: *** [drivers/net/typhoon.o] Error 1

drivers/net/natsemi.c:245: error: natsemi_pci_info causes a section type conflict
make[2]: *** [drivers/net/natsemi.o] Error 1

drivers/net/bnx2.c:95: error: board_info causes a section type conflict
make[2]: *** [drivers/net/bnx2.o] Error 1

drivers/net/bnx2x.c:112: error: board_info causes a section type conflict
make[2]: *** [drivers/net/bnx2x.o] Error 1

drivers/net/bnx2x.c:112: error: board_info causes a section type conflict
make[2]: *** [drivers/net/bnx2x.o] Error 1

drivers/net/via-velocity.c:453: error: velocity_id_table causes a section type conflict
make[2]: *** [drivers/net/via-velocity.o] Error 1

drivers/net/starfire.c:350: error: netdrv_tbl causes a section type conflict
make[2]: *** [drivers/net/starfire.o] Error 1


I have tested the patch for build test only

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
--- linux-2.6.24/drivers/net/typhoon.c	2008-01-25 04:28:37.000000000 +0530
+++ linux-2.6.24/drivers/net/~typhoon.c	2008-02-04 16:21:55.000000000 +0530
@@ -178,7 +178,7 @@ enum typhoon_cards {
 };
 
 /* directly indexed by enum typhoon_cards, above */
-static const struct typhoon_card_info typhoon_card_info[] __devinitdata = {
+static const struct typhoon_card_info typhoon_card_info[] __devinitconst = {
 	{ "3Com Typhoon (3C990-TX)",
 		TYPHOON_CRYPTO_NONE},
 	{ "3Com Typhoon (3CR990-TX-95)",
--- linux-2.6.24/drivers/net/natsemi.c	2008-02-04 14:57:00.000000000 +0530
+++ linux-2.6.24/drivers/net/~natsemi.c	2008-02-04 16:36:22.000000000 +0530
@@ -242,7 +242,7 @@ static const struct {
 	const char *name;
 	unsigned long flags;
 	unsigned int eeprom_size;
-} natsemi_pci_info[] __devinitdata = {
+} natsemi_pci_info[] __devinitconst = {
 	{ "Aculab E1/T1 PMXc cPCI carrier card", NATSEMI_FLAG_IGNORE_PHY, 128 },
 	{ "NatSemi DP8381[56]", 0, 24 },
 };
--- linux-2.6.24/drivers/net/bnx2.c	2008-02-04 14:56:59.000000000 +0530
+++ linux-2.6.24/drivers/net/~bnx2.c	2008-02-04 16:44:02.000000000 +0530
@@ -92,7 +92,7 @@ typedef enum {
 /* indexed by board_t, above */
 static const struct {
 	char *name;
-} board_info[] __devinitdata = {
+} board_info[] __devinitconst = {
 	{ "Broadcom NetXtreme II BCM5706 1000Base-T" },
 	{ "HP NC370T Multifunction Gigabit Server Adapter" },
 	{ "HP NC370i Multifunction Gigabit Server Adapter" },
--- linux-2.6.24/drivers/net/bnx2.c	2008-02-04 16:44:47.000000000 +0530
+++ linux-2.6.24/drivers/net/~bnx2.c	2008-02-04 16:47:08.000000000 +0530
@@ -104,7 +104,7 @@ static const struct {
 	{ "Broadcom NetXtreme II BCM5709 1000Base-SX" },
 	};
 
-static struct pci_device_id bnx2_pci_tbl[] = {
+static struct pci_device_id bnx2_pci_tbl[] __devinitconst = {
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
 	  PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
--- linux-2.6.24/drivers/net/bnx2x.c	2008-02-04 14:57:00.000000000 +0530
+++ linux-2.6.24/drivers/net/~bnx2x.c	2008-02-04 18:01:14.000000000 +0530
@@ -109,7 +109,7 @@ enum bnx2x_board_type {
 /* indexed by board_t, above */
 static const struct {
 	char *name;
-} board_info[] __devinitdata = {
+} board_info[] __devinitconst = {
 	{ "Broadcom NetXtreme II BCM57710 XGb" }
 };
 
--- linux-2.6.24/drivers/net/starfire.c	2008-01-25 04:28:37.000000000 +0530
+++ linux-2.6.24/drivers/net/~starfire.c	2008-02-04 18:08:08.000000000 +0530
@@ -347,7 +347,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tb
 static const struct chip_info {
 	const char *name;
 	int drv_flags;
-} netdrv_tbl[] __devinitdata = {
+} netdrv_tbl[] __devinitconst = {
 	{ "Adaptec Starfire 6915", CanHaveMII },
 };
 
--- linux-2.6.24/drivers/net/via-velocity.c	2008-02-04 14:57:00.000000000 +0530
+++ linux-2.6.24/drivers/net/~via-velocity.c	2008-02-04 18:04:21.000000000 +0530
@@ -450,7 +450,7 @@ static const struct velocity_info_tbl ch
  *	device driver. Used for hotplug autoloading.
  */
 
-static const struct pci_device_id velocity_id_table[] __devinitdata = {
+static const struct pci_device_id velocity_id_table[] __devinitconst = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_612X) },
 	{ }
 };
-- 
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] 2.6.24-mm1 section type conflict cleanup
  2008-02-04 16:22 ` [PATCH] 2.6.24-mm1 section type conflict cleanup Kamalesh Babulal
@ 2008-02-04 18:04   ` Sam Ravnborg
  2008-02-05  4:49     ` Kamalesh Babulal
  0 siblings, 1 reply; 5+ messages in thread
From: Sam Ravnborg @ 2008-02-04 18:04 UTC (permalink / raw)
  To: Kamalesh Babulal; +Cc: Andrew Morton, linux-kernel, netdev, apw, balbir

On Mon, Feb 04, 2008 at 09:52:23PM +0530, Kamalesh Babulal wrote:
> Hi Andrew,
> 
> The 2.6.24-mm1 kernel build fails at many places with section type
> conflict build error.

What arch?
We have troubles with powerpc as pointed out by Al in another thread.

	Sam

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] 2.6.24-mm1 section type conflict cleanup
  2008-02-04 18:04   ` Sam Ravnborg
@ 2008-02-05  4:49     ` Kamalesh Babulal
  0 siblings, 0 replies; 5+ messages in thread
From: Kamalesh Babulal @ 2008-02-05  4:49 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Andrew Morton, linux-kernel, netdev, apw, balbir

Sam Ravnborg wrote:
> On Mon, Feb 04, 2008 at 09:52:23PM +0530, Kamalesh Babulal wrote:
>> Hi Andrew,
>>
>> The 2.6.24-mm1 kernel build fails at many places with section type
>> conflict build error.
> 
> What arch?
> We have troubles with powerpc as pointed out by Al in another thread.
> 
> 	Sam
Hi Sam,

This clean up is done for the powerpc, sorry forgot to mention it.

-- 
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.

^ permalink raw reply	[flat|nested] 5+ messages in thread

[parent not found: <47A79291.5010204@imap.cc>]

* Re: 2.6.24-mm1 - Build failure at net/sched/cls_flow.c:598
       [not found] ` <47A79291.5010204@imap.cc>
@ 2008-02-04 23:25   ` Andrew Morton
  2008-02-05  7:24     ` Rami Rosen
  0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2008-02-04 23:25 UTC (permalink / raw)
  To: Tilman Schmidt; +Cc: linux-kernel, Patrick McHardy, netdev

On Mon, 04 Feb 2008 23:32:49 +0100
Tilman Schmidt <tilman@imap.cc> wrote:

> My attempt to build this failed with:
> 
>    CC [M]  net/sched/cls_flow.o
> net/sched/cls_flow.c: In function ___flow_dump___:
> net/sched/cls_flow.c:598: error: ___struct tcf_ematch_tree___ has no member named ___hdr___
> 
> Config attached.

Thanks.  hm.

	#else /* CONFIG_NET_EMATCH */

	struct tcf_ematch_tree
	{
	};

methinks Patrick has a CONFIG_NET_EMATCH=n problem?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: 2.6.24-mm1 - Build failure at net/sched/cls_flow.c:598
  2008-02-04 23:25   ` 2.6.24-mm1 - Build failure at net/sched/cls_flow.c:598 Andrew Morton
@ 2008-02-05  7:24     ` Rami Rosen
  0 siblings, 0 replies; 5+ messages in thread
From: Rami Rosen @ 2008-02-05  7:24 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Tilman Schmidt, linux-kernel, Patrick McHardy, netdev

Hello,
  I had sent a patch recently (which is currently pending) which
solves this problem.

see:
http://www.spinics.net/lists/netdev/msg54455.html


Regards,
Rami Rosen


On Feb 5, 2008 1:25 AM, Andrew Morton <akpm@linux-foundation.org> wrote:
> On Mon, 04 Feb 2008 23:32:49 +0100
> Tilman Schmidt <tilman@imap.cc> wrote:
>
> > My attempt to build this failed with:
> >
> >    CC [M]  net/sched/cls_flow.o
> > net/sched/cls_flow.c: In function ___flow_dump___:
> > net/sched/cls_flow.c:598: error: ___struct tcf_ematch_tree___ has no member named ___hdr___
> >
> > Config attached.
>
> Thanks.  hm.
>
>         #else /* CONFIG_NET_EMATCH */
>
>         struct tcf_ematch_tree
>         {
>         };
>
> methinks Patrick has a CONFIG_NET_EMATCH=n problem?
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-02-05  7:24 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20080203171634.58ab668b.akpm@linux-foundation.org>
2008-02-04 16:22 ` [PATCH] 2.6.24-mm1 section type conflict cleanup Kamalesh Babulal
2008-02-04 18:04   ` Sam Ravnborg
2008-02-05  4:49     ` Kamalesh Babulal
     [not found] ` <47A79291.5010204@imap.cc>
2008-02-04 23:25   ` 2.6.24-mm1 - Build failure at net/sched/cls_flow.c:598 Andrew Morton
2008-02-05  7:24     ` Rami Rosen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).