8390: Fix ne.c build

Since commit 055e5110ae0c0c1176a75b78d789294f2ff2f7af ("8390: Split 8390 support into a pausing and a non pausing driver core"), ne.c cause this build failure:

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'

Quoted 4 lines · Atsushi Nemoto

Since commit 055e5110ae0c0c1176a75b78d789294f2ff2f7af ("8390: Split 8390 support into a pausing and a non pausing driver core"), ne.c cause this build failure:

Quoted 4 lines

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'

i just triggered a similar build failure, but in a different ne2000-derived file:

Quoted 12 lines · On Mon, 21 Jul 2008 21:15:19 +0200 Ingo Molnar <[email protected]> wrote:

Quoted 8 lines · Atsushi Nemoto

Since commit 055e5110ae0c0c1176a75b78d789294f2ff2f7af ("8390: Split 8390 support into a pausing and a non pausing driver core"), ne.c cause this build failure:

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'

Quoted 2 lines

i just triggered a similar build failure, but in a different ne2000-derived file:

I'll take a look. Various odd things happened with the Makefile for this patch and the follow up fixes. If the followup didn't get applied then that might explain the breakage.

find the full tested patch below. It solves the build failures i triggered so far.

Quoted 9 lines · Alan Cox

Quoted 6 lines · On Mon, 21 Jul 2008 21:15:19 +0200 Ingo Molnar <[email protected]> wrote:

Quoted 4 lines · Atsushi Nemoto

Since commit 055e5110ae0c0c1176a75b78d789294f2ff2f7af ("8390: Split 8390 support into a pausing and a non pausing driver core"), ne.c cause this build failure:

Quoted 6 lines

Quoted 5 lines

Quoted 4 lines

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'

i just triggered a similar build failure, but in a different ne2000-derived file:

I'll take a look. Various odd things happened with the Makefile for this patch and the follow up fixes. If the followup didn't get applied then that might explain the breakage.

ok. I also got:

drivers/built-in.o: In function `hp_probe1':
hp.c:(.init.text+0xa280): undefined reference to `NS8390_init'

so i suspect most of the 8390p.o library using ne2000 drivers are affected?

i think instead of a manual review i think this is better to fix all the problems:

cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \

  $(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \
     sed 's/.o$/.c/g'))

find the full tested patch below. It solves the build failures i triggered so far.

Ingo

------------->
commit 79f2b8594df44a4f3f11085df656883525b74abd

Author: Ingo Molnar <[email protected]>
Date:   Tue Jul 22 09:19:31 2008 +0200

net 8390p: fix interface usage

various drivers were using the wrong APIs:

drivers/built-in.o: In function `hp_probe1':
hp.c:(.init.text+0xa280): undefined reference to `NS8390_init'

fixed via:

cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \
$(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \
sed 's/.o$/.c/g'))

Signed-off-by Ingo Molnar <[email protected]>

---
 drivers/net/hp-plus.c |    2 +-
 drivers/net/hp.c      |    2 +-
 drivers/net/ne.c      |    2 +-
 drivers/net/ne2.c     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

drivers/net/hp-plus.c +1 -1

index c2c4f49..8239939 100644
@@ -262,7 +262,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
 	}
 
 	outw(Perf_Page, ioaddr + HP_PAGING);
-	NS8390_init(dev, 0);
+	NS8390p_init(dev, 0);
 	/* Leave the 8390 and HP chip reset. */
 	outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);
 

drivers/net/hp.c +1 -1

index 8281209..0a8c649 100644
@@ -389,7 +389,7 @@ static void __init
 hp_init_card(struct net_device *dev)
 {
 	int irq = dev->irq;
-	NS8390_init(dev, 0);
+	NS8390p_init(dev, 0);
 	outb_p(irqmap[irq&0x0f] | HP_RUN,
 		   dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
 	return;

drivers/net/ne.c +1 -1

index 3df231d..4a8a4b1 100644
@@ -355,7 +355,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
 	}
 
 	/* Read the 16 bytes of station address PROM.
-	   We must first initialize registers, similar to NS8390_init(eifdev, 0).
+	   We must first initialize registers, similar to NS8390p_init(eifdev, 0).
 	   We can't reliably read the SAPROM address without this.
 	   (I learned the hard way!). */
 	{

drivers/net/ne2.c +0 -0

index 8f72563..332df75 100644

Quoted 92 lines

Quoted 9 lines

Quoted 6 lines

Quoted 4 lines

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'

i just triggered a similar build failure, but in a different ne2000-derived file:

I'll take a look. Various odd things happened with the Makefile for this patch and the follow up fixes. If the followup didn't get applied then that might explain the breakage.

ok. I also got:

drivers/built-in.o: In function `hp_probe1':
hp.c:(.init.text+0xa280): undefined reference to `NS8390_init'

so i suspect most of the 8390p.o library using ne2000 drivers are affected?

i think instead of a manual review i think this is better to fix all the problems:

cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \

  $(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \
     sed 's/.o$/.c/g'))

find the full tested patch below. It solves the build failures i triggered so far.

Ingo

------------->
commit 79f2b8594df44a4f3f11085df656883525b74abd

Author: Ingo Molnar <[email protected]>
Date:   Tue Jul 22 09:19:31 2008 +0200

net 8390p: fix interface usage
various drivers were using the wrong APIs:
drivers/built-in.o: In function `hp_probe1':
hp.c:(.init.text+0xa280): undefined reference to `NS8390_init'
fixed via:
cd drivers/net/; sed -i 's/NS8390_/NS8390p_/g' \
$(grep -l NS8390_ $(grep 8390p.o Makefile | cut -d' ' -f3 | \
sed 's/.o$/.c/g'))

Signed-off-by Ingo Molnar <[email protected]>

---
 drivers/net/hp-plus.c |    2 +-
 drivers/net/hp.c      |    2 +-
 drivers/net/ne.c      |    2 +-
 drivers/net/ne2.c     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

drivers/net/hp-plus.c +1 -1

index c2c4f49..8239939 100644
@@ -262,7 +262,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
 	}
  	outw(Perf_Page, ioaddr + HP_PAGING);
-	NS8390_init(dev, 0);
+	NS8390p_init(dev, 0);
 	/* Leave the 8390 and HP chip reset. */
 	outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);
 diff --git a/drivers/net/hp.c b/drivers/net/hp.c

index 8281209..0a8c649 100644

drivers/net/hp.c +1 -1

@@ -389,7 +389,7 @@ static void __init
 hp_init_card(struct net_device *dev)
 {
 	int irq = dev->irq;
-	NS8390_init(dev, 0);
+	NS8390p_init(dev, 0);
 	outb_p(irqmap[irq&0x0f] | HP_RUN,
 		   dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
 	return;

drivers/net/ne.c +1 -1

index 3df231d..4a8a4b1 100644
@@ -355,7 +355,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
 	}
  	/* Read the 16 bytes of station address PROM.
-	   We must first initialize registers, similar to NS8390_init(eifdev, 0).
+	   We must first initialize registers, similar to NS8390p_init(eifdev, 0).
 	   We can't reliably read the SAPROM address without this.
 	   (I learned the hard way!). */
 	{

drivers/net/ne2.c +0 -0

index 8f72563..332df75 100644
@@ -404,7 +404,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)

drivers/net/ne2.c static int __init ne2_probe1(struct net_device *dev, int slot) · line 408

Quoted 6 lines

drivers/net/ne2.c +1 -1

  	/* Read the 16 bytes of station address PROM.
 	   We must first initialize registers, similar to
-	   NS8390_init(eifdev, 0).
+	   NS8390p_init(eifdev, 0).
 	   We can't reliably read the SAPROM address without this.
 	   (I learned the hard way!). */

applied

not sure it's known but despite all the fixes i still get:

Quoted 2 lines · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

I'll have a look at this next week or possibly the week after. The original patches worked but they spent 3 months going round in circles and I've completely given up even trying to work out what happened or why all the previous updates I sent were ignored.

Quoted 1 line · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

I'll have a look at this next week or possibly the week after. The original patches worked but they spent 3 months going round in circles and I've completely given up even trying to work out what happened or why all the previous updates I sent were ignored.

Quoted 9 lines · Alan Cox

Quoted 1 line · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

I'll have a look at this next week or possibly the week after. The original patches worked but they spent 3 months going round in circles and I've completely given up even trying to work out what happened or why all the previous updates I sent were ignored.

My apologies. FWIW, from my point of view the same patch(es) kept getting fixed and updated and going around in circles, so I kept waiting. Since it was was a net-next issue (until now), I lowered the priority and waited to let you guys (you, Andrew, Randy mainly) sort things out.

So far the only remaining patch I have outstanding and needing to be applied is from Atsushi-san via Ingo (message id <[email protected]>)... is that the last of it?

My apologies. FWIW, from my point of view the same patch(es) kept getting fixed and updated and going around in circles, so I kept waiting. Since it was was a net-next issue (until now), I lowered the priority and waited to let you guys (you, Andrew, Randy mainly) sort things out.

So far the only remaining patch I have outstanding and needing to be applied is from Atsushi-san via Ingo (message id <[email protected]>)... is that the last of it?

not sure it's known but despite all the fixes i still get:

drivers/built-in.o: In function `ne_drv_resume':
ne.c:(.text+0x146ba4): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text+0x146e00): undefined reference to `NS8390_init'

Quoted 7 lines · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

drivers/built-in.o: In function `ne_drv_resume':
ne.c:(.text+0x146ba4): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text+0x146e00): undefined reference to `NS8390_init'

This should do the trick. I can't test it currently as that configuration now fails to build with mm errors in current git head..

mm/hugetlb.c: In function ???hugetlb_acct_memory???: mm/hugetlb.c:1507:
error: implicit declaration of function ???cpuset_mems_nr???

Quoted 7 lines · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

drivers/built-in.o: In function `ne_drv_resume':
ne.c:(.text+0x146ba4): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text+0x146e00): undefined reference to `NS8390_init'

This should do the trick. I can't test it currently as that configuration now fails to build with mm errors in current git head..

mm/hugetlb.c: In function ???hugetlb_acct_memory???: mm/hugetlb.c:1507:
error: implicit declaration of function ???cpuset_mems_nr???

[resending with Linus' address fixed]

Quoted 16 lines · Alan Cox

Quoted 7 lines · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

drivers/built-in.o: In function `ne_drv_resume':
ne.c:(.text+0x146ba4): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text+0x146e00): undefined reference to `NS8390_init'

This should do the trick. I can't test it currently as that configuration now fails to build with mm errors in current git head..

mm/hugetlb.c: In function ???hugetlb_acct_memory???: mm/hugetlb.c:1507:
error: implicit declaration of function ???cpuset_mems_nr???

When moving the intialization functions around, I did not remove the dependency of some helpers on CONFIG_SYSCTL. This led to a large chunk of code being elided even though it is needed to build hugetlb.o.

Fixes a build failure reported by Alan Cox:

mm/hugetlb.c: In function ______hugetlb_acct_memory______: mm/hugetlb.c:1507:
error: implicit declaration of function ______cpuset_mems_nr______

Signed-off-by Nishanth Aravamudan <[email protected]>

mm/hugetlb.c +0 -1

index 41341c4..3be79dc 100644
@@ -1026,7 +1026,6 @@ static void __init report_hugepages(void)
 	}
 }
 
-#ifdef CONFIG_SYSCTL
 #ifdef CONFIG_HIGHMEM
 static void try_to_free_low(struct hstate *h, unsigned long count)
 {

Quoted 14 lines · On Fri, 25 Jul 2008 13:33:51 -0700 Nishanth Aravamudan <[email protected]> wrote:

[resending with Linus' address fixed]

Quoted 11 lines · Alan Cox

Quoted 7 lines · On Thu, 24 Jul 2008 07:26:03 +0200 Ingo Molnar <[email protected]> wrote:

not sure it's known but despite all the fixes i still get:

drivers/built-in.o: In function `ne_drv_resume':
ne.c:(.text+0x146ba4): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text+0x146e00): undefined reference to `NS8390_init'

Quoted 5 lines

Quoted 5 lines

This should do the trick. I can't test it currently as that configuration now fails to build with mm errors in current git head..

mm/hugetlb.c: In function ???hugetlb_acct_memory???: mm/hugetlb.c:1507:
error: implicit declaration of function ???cpuset_mems_nr???

Remind me to give a wedgie to the next gcc developer I meet.

Quoted 4 lines

When moving the intialization functions around, I did not remove the dependency of some helpers on CONFIG_SYSCTL. This led to a large chunk of code being elided even though it is needed to build hugetlb.o.

Quoted 4 lines

Fixes a build failure reported by Alan Cox:

mm/hugetlb.c: In function ______hugetlb_acct_memory______: mm/hugetlb.c:1507:
error: implicit declaration of function ______cpuset_mems_nr______

And the next one.

LANG=C stomps this silliness.

[resending with Linus' address fixed]

Quoted 2 lines · Nishanth Aravamudan

[resending with Linus' address fixed]

Hmm, this doesn't apply for me any more. Can you check the current -git tree?

Quoted 4 lines · On Fri, 25 Jul 2008 17:32:38 -0700 (PDT) Linus Torvalds…

Quoted 1 line · Nishanth Aravamudan

Quoted 5 lines

Quoted 1 line

[resending with Linus' address fixed]

Hmm, this doesn't apply for me any more. Can you check the current -git tree?

Is OK, I have a fixed-up version here which I'm about to start testing.

Quoted 9 lines · Andrew Morton

Quoted 6 lines · On Fri, 25 Jul 2008 17:32:38 -0700 (PDT) Linus Torvalds…

Quoted 2 lines · Nishanth Aravamudan

[resending with Linus' address fixed]

Quoted 5 lines

Quoted 3 lines

Hmm, this doesn't apply for me any more. Can you check the current -git tree?

Is OK, I have a fixed-up version here which I'm about to start testing.

Ah, I see that Linus had already picked up Ingo's fix (e44d1b2998d62a1f2f4d7eb17b56ba396535509f).

While that does fix the
build, it isn't really the right solution. I'm guessing Andrew's version will be a revert (either real or in patch-form) of that commit and an application of mine?

Since commit 055e5110ae0c0c1176a75b78d789294f2ff2f7af ("8390: Split 8390 support into a pausing and a non pausing driver core"), ne.c cause this build failure:

drivers/built-in.o: In function `ne_probe1':
ne.c:(.init.text+0x2464): undefined reference to NS8390_init' drivers/built-in.o: In function ne_block_output':
ne.c:(.text.ne_block_output+0x1b0): undefined reference to `NS8390_init'