linux-next: sparc64 build failure

linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]

Hi Dave, Greg,

Today's build of linux-next (sparc64 defconfig) failed like this:

arch/sparc64/kernel/pci.c: In function `of_create_pci_dev':
arch/sparc64/kernel/pci.c:412: warning: passing arg 1 of `sprintf' discards qualifiers from pointer target type
make[2]: *** [arch/sparc64/kernel/pci.o] Error 1

This was caused by commit bd24b944eb93549b1ca5becbf27c7373504f7eed
("driver-core: prepare for removal of 20 char limit from struct device")
from the driver-core tree which made pci_name() return a "const char *".

I have applied the following patch.

Greg, it would really help if a version of dev_set_name() was created
early ... like in Linus' tree now?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From eee5cd99ea3b4e93f41e7f6486d799d198c87750 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2008 17:51:05 +1000
Subject: [PATCH] sparc: fallout from pci_name() constifying

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc64/kernel/pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 112b09f..5509619 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
 	dev->class = class >> 8;
 	dev->revision = class & 0xff;
 
-	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
+	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
 		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
 
 	if (ofpci_verbose)
-- 
1.5.5.2


[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: sparc64 build failure

[Greg KH]

On Thu, May 29, 2008 at 05:53:32PM +1000, Stephen Rothwell wrote:
> Hi Dave, Greg,
> 
> Today's build of linux-next (sparc64 defconfig) failed like this:
> 
> arch/sparc64/kernel/pci.c: In function `of_create_pci_dev':
> arch/sparc64/kernel/pci.c:412: warning: passing arg 1 of `sprintf' discards qualifiers from pointer target type
> make[2]: *** [arch/sparc64/kernel/pci.o] Error 1
> 
> This was caused by commit bd24b944eb93549b1ca5becbf27c7373504f7eed
> ("driver-core: prepare for removal of 20 char limit from struct device")
> from the driver-core tree which made pci_name() return a "const char *".
> 
> I have applied the following patch.
> 
> Greg, it would really help if a version of dev_set_name() was created
> early ... like in Linus' tree now?

I'm trying to do that right now, but it's causing a little oops at boot
time that would not be nice to introduce so late in the game :)

We're working on it.

> >From eee5cd99ea3b4e93f41e7f6486d799d198c87750 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 May 2008 17:51:05 +1000
> Subject: [PATCH] sparc: fallout from pci_name() constifying
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/sparc64/kernel/pci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
> index 112b09f..5509619 100644
> --- a/arch/sparc64/kernel/pci.c
> +++ b/arch/sparc64/kernel/pci.c
> @@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
>  	dev->class = class >> 8;
>  	dev->revision = class & 0xff;
>  
> -	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> +	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
>  		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));

It's wierd that we broke the build like this, I'll work to merge this in
so that it isn't broken.

thanks,

greg k-h

Re: linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

Hi Greg,

On Thu, 29 May 2008 15:01:58 -0700 Greg KH <greg@kroah.com> wrote:
>
> > -	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> > +	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> >  		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
> 
> It's wierd that we broke the build like this, I'll work to merge this in
> so that it isn't broken.

It broke the build because arch/sparc64 is (mostly) built with -Werror.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: sparc64 build failure

[Greg KH]

On Fri, May 30, 2008 at 03:38:47PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Thu, 29 May 2008 15:01:58 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > > -	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> > > +	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
> > >  		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
> > 
> > It's wierd that we broke the build like this, I'll work to merge this in
> > so that it isn't broken.
> 
> It broke the build because arch/sparc64 is (mostly) built with -Werror.

Sorry, no, I realized that, I was confused as to why a warning was
created here.  Turns out that pci_name() was being changed to a const
string, and the compiler was rightfully saying that we can't be using
that for an assignment.

I've fixed it up correctly in my latest tree, which you should have
already.

thanks,

greg k-h

Re: linux-next: sparc64 build failure

[Sam Ravnborg]

On Wed, Jul 09, 2008 at 09:15:15PM +1000, Stephen Rothwell wrote:
> Hi Sam,
> 
> Today's linux-next build (sparc64 allmodconfig) failed like this:
> 
> usr/include/asm/auxvec.h:1: included file 'asm-sparc/auxvec.h' is not exported
> usr/include/asm/bpp.h:1: included file 'asm-sparc/bpp.h' is not exported
> usr/include/asm/byteorder.h:1: included file 'asm-sparc/byteorder.h' is not exported
> usr/include/asm/errno.h:1: included file 'asm-sparc/errno.h' is not exported
> usr/include/asm/openpromio.h:1: included file 'asm-sparc/openpromio.h' is not exported
> usr/include/asm/perfctr.h:1: included file 'asm-sparc/perfctr.h' is not exported

My bad - but I do not have time to look into it now.
Too much painting/moving stuff - sorry!

	Sam

linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 677 bytes --]

Hi Sam,

Today's linux-next build (sparc64 allmodconfig) failed like this:

usr/include/asm/auxvec.h:1: included file 'asm-sparc/auxvec.h' is not exported
usr/include/asm/bpp.h:1: included file 'asm-sparc/bpp.h' is not exported
usr/include/asm/byteorder.h:1: included file 'asm-sparc/byteorder.h' is not exported
usr/include/asm/errno.h:1: included file 'asm-sparc/errno.h' is not exported
usr/include/asm/openpromio.h:1: included file 'asm-sparc/openpromio.h' is not exported
usr/include/asm/perfctr.h:1: included file 'asm-sparc/perfctr.h' is not exported

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: sparc64 build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jul 2008 19:08:37 +1000

> Caused by commit 5b01a6a61c48d8e6ab4679d6e6208f5962d07b85 ("sysdev: Pass
> the attribute to the low level sysdev show/store function") from the
> driver-core tree.  I have applied the patch below.

If the driver-core folks could add this patch to their tree to that
changeset, I'd appreciate it. :)

Acked-by: David S. Miller <davem@davemloft.net>

linux-next: sparc64 build failure

[Stephen Rothwell]

Hi David,

Today's linux-next build (sparc64 defconfig) failed like this:

arch/sparc64/kernel/sysfs.c:160: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:160: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:205: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:206: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:207: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:208: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:209: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:210: warning: initialization from incompatible pointer type
arch/sparc64/kernel/sysfs.c:211: warning: initialization from incompatible pointer type
make[2]: *** [arch/sparc64/kernel/sysfs.o] Error 1

Caused by commit 5b01a6a61c48d8e6ab4679d6e6208f5962d07b85 ("sysdev: Pass
the attribute to the low level sysdev show/store function") from the
driver-core tree.  I have applied the patch below.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 2b3ba8b78163527dade51c5c92ce52526abbb198 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Jul 2008 19:03:49 +1000
Subject: [PATCH] sparc64: sysdev API change fallout

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc64/kernel/sysfs.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/sparc64/kernel/sysfs.c b/arch/sparc64/kernel/sysfs.c
index b057bc1..47478ce 100644
--- a/arch/sparc64/kernel/sysfs.c
+++ b/arch/sparc64/kernel/sysfs.c
@@ -136,13 +136,13 @@ static unsigned long write_mmustat_enable(unsigned long val)
 	return sun4v_mmustat_conf(ra, &orig_ra);
 }
 
-static ssize_t show_mmustat_enable(struct sys_device *s, char *buf)
+static ssize_t show_mmustat_enable(struct sys_device *s, struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long val = run_on_cpu(s->id, read_mmustat_enable, 0);
 	return sprintf(buf, "%lx\n", val);
 }
 
-static ssize_t store_mmustat_enable(struct sys_device *s, const char *buf, size_t count)
+static ssize_t store_mmustat_enable(struct sys_device *s, struct sysdev_attribute *attr, const char *buf, size_t count)
 {
 	unsigned long val, err;
 	int ret = sscanf(buf, "%ld", &val);
@@ -180,14 +180,14 @@ static void unregister_mmu_stats(struct sys_device *s)
 #endif
 
 #define SHOW_CPUDATA_ULONG_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
+static ssize_t show_##NAME(struct sys_device *dev, struct sysdev_attribute *attr, char *buf) \
 { \
 	cpuinfo_sparc *c = &cpu_data(dev->id); \
 	return sprintf(buf, "%lu\n", c->MEMBER); \
 }
 
 #define SHOW_CPUDATA_UINT_NAME(NAME, MEMBER) \
-static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
+static ssize_t show_##NAME(struct sys_device *dev, struct sysdev_attribute *attr, char *buf) \
 { \
 	cpuinfo_sparc *c = &cpu_data(dev->id); \
 	return sprintf(buf, "%u\n", c->MEMBER); \
-- 
1.5.6.2

Re: linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

Hi Sam,

On Fri, 20 Jun 2008 10:34:43 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> I have not looked into it yet. But I assume this is a merge issue.
> sparc-next.git is OK
> kbuild-next.git is OK
> 
> But when merged we break sparc64.
> So I need to feed David a patch so I do not break it with kbuild-next.git,
> or I need to do something in kbuil-next.git to avoid the breakage.
> 
> I will sort it out in the weekend.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: sparc64 build failure

[Sam Ravnborg]

On Fri, Jun 20, 2008 at 05:53:11PM +1000, Stephen Rothwell wrote:
> Hi Sam,
> 
> On Fri, 20 Jun 2008 09:34:44 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > On Thu, Jun 19, 2008 at 05:55:20PM -0700, David Miller wrote:
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Fri, 20 Jun 2008 10:43:52 +1000
> > > 
> > > > Yesterday's linux-next build (sparc64 allmodconfig) failed like this:
> > > 
> > > Sam knowingly added this problem :-)
> > Yes - this is all my fault.
> > It must hurt a little before it becomes good!
> 
> Yep, OK.
> 
> Seriously, though the sparc64 allmodconfig has been broken by this for
> two days and we really don't want any deliberate bisection breakage if we
> can avoid it.

I have not looked into it yet. But I assume this is a merge issue.
sparc-next.git is OK
kbuild-next.git is OK

But when merged we break sparc64.
So I need to feed David a patch so I do not break it with kbuild-next.git,
or I need to do something in kbuil-next.git to avoid the breakage.

I will sort it out in the weekend.

	Sam

Re: linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

Hi Sam,

On Fri, 20 Jun 2008 09:34:44 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Thu, Jun 19, 2008 at 05:55:20PM -0700, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 20 Jun 2008 10:43:52 +1000
> > 
> > > Yesterday's linux-next build (sparc64 allmodconfig) failed like this:
> > 
> > Sam knowingly added this problem :-)
> Yes - this is all my fault.
> It must hurt a little before it becomes good!

Yep, OK.

Seriously, though the sparc64 allmodconfig has been broken by this for
two days and we really don't want any deliberate bisection breakage if we
can avoid it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: sparc64 build failure

[Sam Ravnborg]

On Thu, Jun 19, 2008 at 05:55:20PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 20 Jun 2008 10:43:52 +1000
> 
> > Yesterday's linux-next build (sparc64 allmodconfig) failed like this:
> 
> Sam knowingly added this problem :-)
Yes - this is all my fault.
It must hurt a little before it becomes good!

	Sam

Re: linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

On Thu, 19 Jun 2008 17:55:20 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 20 Jun 2008 10:43:52 +1000
> 
> > Yesterday's linux-next build (sparc64 allmodconfig) failed like this:
> 
> Sam knowingly added this problem :-)

So, I assume he has "cunning scheme" to fix this soon ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: sparc64 build failure

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Jun 2008 10:43:52 +1000

> Yesterday's linux-next build (sparc64 allmodconfig) failed like this:

Sam knowingly added this problem :-)

linux-next: sparc64 build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2789 bytes --]

Hi Dave,

Yesterday's linux-next build (sparc64 allmodconfig) failed like this:

usr/include/asm/asi.h:1: included file 'asm-sparc/asi.h' is not exported
usr/include/asm/auxvec.h:1: included file 'asm-sparc/auxvec.h' is not exported
usr/include/asm/bpp.h:1: included file 'asm-sparc/bpp.h' is not exported
usr/include/asm/byteorder.h:1: included file 'asm-sparc/byteorder.h' is not exported
usr/include/asm/display7seg.h:1: included file 'asm-sparc/display7seg.h' is not exported
usr/include/asm/envctrl.h:1: included file 'asm-sparc/envctrl.h' is not exported
usr/include/asm/errno.h:1: included file 'asm-sparc/errno.h' is not exported
usr/include/asm/fbio.h:1: included file 'asm-sparc/fbio.h' is not exported
usr/include/asm/fcntl.h:1: included file 'asm-sparc/fcntl.h' is not exported
usr/include/asm/ioctl.h:1: included file 'asm-sparc/ioctl.h' is not exported
usr/include/asm/ioctls.h:1: included file 'asm-sparc/ioctls.h' is not exported
usr/include/asm/mman.h:1: included file 'asm-sparc/mman.h' is not exported
usr/include/asm/msgbuf.h:1: included file 'asm-sparc/msgbuf.h' is not exported
usr/include/asm/openpromio.h:1: included file 'asm-sparc/openpromio.h' is not exported
usr/include/asm/param.h:1: included file 'asm-sparc/param.h' is not exported
usr/include/asm/perfctr.h:1: included file 'asm-sparc/perfctr.h' is not exported
usr/include/asm/poll.h:1: included file 'asm-sparc/poll.h' is not exported
usr/include/asm/psrcompat.h:1: included file 'asm-sparc/psrcompat.h' is not exported
usr/include/asm/pstate.h:1: included file 'asm-sparc/pstate.h' is not exported
usr/include/asm/resource.h:1: included file 'asm-sparc/resource.h' is not exported
usr/include/asm/sembuf.h:1: included file 'asm-sparc/sembuf.h' is not exported
usr/include/asm/setup.h:1: included file 'asm-sparc/setup.h' is not exported
usr/include/asm/shmbuf.h:1: included file 'asm-sparc/shmbuf.h' is not exported
usr/include/asm/socket.h:1: included file 'asm-sparc/socket.h' is not exported
usr/include/asm/sockios.h:1: included file 'asm-sparc/sockios.h' is not exported
usr/include/asm/termbits.h:1: included file 'asm-sparc/termbits.h' is not exported
usr/include/asm/termios.h:1: included file 'asm-sparc/termios.h' is not exported
usr/include/asm/types.h:1: included file 'asm-sparc/types.h' is not exported
usr/include/asm/uctx.h:1: included file 'asm-sparc/uctx.h' is not exported
usr/include/asm/utrap.h:1: included file 'asm-sparc/utrap.h' is not exported
usr/include/asm/watchdog.h:1: included file 'asm-sparc/watchdog.h' is not exported
make[3]: *** [usr/include/asm/.check] Error 1

See http://kisskb.ellerman.id.au/kisskb/buildresult/32521/
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]