Re: linux-next: origin tree build warning

Re: linux-next: origin tree build warning

[Linus Torvalds]

On Fri, 1 Jan 2010, Stephen Rothwell wrote:
> 
> Today's linux-next build (powerpc allnoconfig) produced this warning:
> 
> drivers/pci/quirks.c: In function 'pci_dev_specific_reset':
> drivers/pci/quirks.c:2699: warning: assignment discards qualifiers from pointer target type
> 
> Introduced by commit 5b889bf237fca383b5807ad69fde3ad1e2287e42 ("PCI: Fix
> build if quirks are not enabled").

Does this trivial patch get rid of it?

		Linus
---
 drivers/pci/quirks.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 5c449fc..c746943 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2694,7 +2694,7 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
 
 int pci_dev_specific_reset(struct pci_dev *dev, int probe)
 {
-	struct pci_dev_reset_methods *i;
+	const struct pci_dev_reset_methods *i;
 
 	for (i = pci_dev_reset_methods; i->reset; i++) {
 		if ((i->vendor == dev->vendor ||

Re: linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Linus,

On Thu, 31 Dec 2009 16:34:37 -0800 (PST) Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Fri, 1 Jan 2010, Stephen Rothwell wrote:
> >
> > Today's linux-next build (powerpc allnoconfig) produced this warning:
>
> Does this trivial patch get rid of it?

Yep.

Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

I did actually get this warning for all sorts of configs/architectures,
obviously, I just reported it against the first that popped up.

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

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

Re: linux-next: origin tree build warning

[Rafael J. Wysocki]

On Friday 01 January 2010, Stephen Rothwell wrote:
> Hi Linus,
> 
> On Thu, 31 Dec 2009 16:34:37 -0800 (PST) Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > On Fri, 1 Jan 2010, Stephen Rothwell wrote:
> > >
> > > Today's linux-next build (powerpc allnoconfig) produced this warning:
> >
> > Does this trivial patch get rid of it?
> 
> Yep.
> 
> Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> I did actually get this warning for all sorts of configs/architectures,
> obviously, I just reported it against the first that popped up.

Sorry for that, should have double checked.

Rafael

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/gpu/drm/radeon/radeon_agp.c: In function 'radeon_agp_init':
drivers/gpu/drm/radeon/radeon_agp.c:137: warning: format '%d' expects type 'int', but argument 4 has type 'size_t'

Introduced by commit 0a3f316370da07fcdb11fde4f5a683d60713b7fd
("drm/radeon/kms: Disable AGP is aperture size < 32M").

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (x86_64_allmodconfig) produced these warnings:

drivers/base/memory.c:319: warning: initialization from incompatible pointer type
drivers/base/memory.c:353: warning: initialization from incompatible pointer type
drivers/base/memory.c:408: warning: initialization from incompatible pointer type
drivers/base/memory.c:409: warning: initialization from incompatible pointer type

Introduced by commit 8ff410daa009c4b44be445ded5b0cec00abc0426 ("sysdev:
fix prototype for memory_sysdev_class show/store functions").

The third parameter to SYSDEV_CLASS_ATTR should be a "ssize_t (*)(struct
sysdev_class *, char *)", but this commit changes them to "ssize_t (*)
(struct sysdev_class *, struct sysdev_class_attribute *, char *buf)".  Or
maybe the definition of "struct sysdev_class_attribute" is wrong?

It actually looks like commit c29af9636 ("sysdev: Pass attribute in
sysdev_class attributes show/store") referred to in the changelog for the
above commit has not yet been applied to Linus' tree?

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

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

Re: linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> sysdev_class attributes show/store") referred to in the changelog for the
> above commit has not yet been applied to Linus' tree?

Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
show/store") does appear in linux-next since next-20100111 (in the
driver-core quilt series - therefore intended for 2.6.34) (it will have a
different SHA1 today)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

RE: linux-next: origin tree build warning

[Wu, Fengguang]

On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> > sysdev_class attributes show/store") referred to in the changelog for the
> > above commit has not yet been applied to Linus' tree?
>
> Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
> show/store") does appear in linux-next since next-20100111 (in the
> driver-core quilt series - therefore intended for 2.6.34) (it will have a
> different SHA1 today)

So let's queue 8ff410daa009c (sysdev: fix prototype for memory_sysdev_class show/store functions)
in driver-core and delay it to 2.6.34?

Thanks,
Fengguang

Re: linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Fengguang,

On Mon, 18 Jan 2010 12:29:52 +0800 "Wu, Fengguang" <fengguang.wu@intel.com> wrote:
>
> On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> > > sysdev_class attributes show/store") referred to in the changelog for the
> > > above commit has not yet been applied to Linus' tree?
> >
> > Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
> > show/store") does appear in linux-next since next-20100111 (in the
> > driver-core quilt series - therefore intended for 2.6.34) (it will have a
> > different SHA1 today)
> 
> So let's queue 8ff410daa009c (sysdev: fix prototype for memory_sysdev_class show/store functions)
> in driver-core and delay it to 2.6.34?

Then it would need to be reverted from Linus' tree.

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

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

Re: linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Fengguang,

On Mon, 18 Jan 2010 16:40:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 18 Jan 2010 12:29:52 +0800 "Wu, Fengguang" <fengguang.wu@intel.com> wrote:
> >
> > On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> > > > sysdev_class attributes show/store") referred to in the changelog for the
> > > > above commit has not yet been applied to Linus' tree?
> > >
> > > Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
> > > show/store") does appear in linux-next since next-20100111 (in the
> > > driver-core quilt series - therefore intended for 2.6.34) (it will have a
> > > different SHA1 today)
> > 
> > So let's queue 8ff410daa009c (sysdev: fix prototype for memory_sysdev_class show/store functions)
> > in driver-core and delay it to 2.6.34?
> 
> Then it would need to be reverted from Linus' tree.

I have reverted commit 8ff410daa009c for today.  It looks like Greg
already has the alternate patches queued in the driver-core tree to take
care of this problem when it arises.

So, Greg, can you ask Linus to revert 8ff410daa009c (sysdev: fix
prototype for memory_sysdev_class show/store functions), please?  Or
should I?  Or should we hope he notices these emails? :-)

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

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

Re: linux-next: origin tree build warning

[Greg KH]

On Tue, Jan 19, 2010 at 11:12:26AM +1100, Stephen Rothwell wrote:
> Hi Fengguang,
> 
> On Mon, 18 Jan 2010 16:40:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 18 Jan 2010 12:29:52 +0800 "Wu, Fengguang" <fengguang.wu@intel.com> wrote:
> > >
> > > On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> > > > > sysdev_class attributes show/store") referred to in the changelog for the
> > > > > above commit has not yet been applied to Linus' tree?
> > > >
> > > > Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
> > > > show/store") does appear in linux-next since next-20100111 (in the
> > > > driver-core quilt series - therefore intended for 2.6.34) (it will have a
> > > > different SHA1 today)
> > > 
> > > So let's queue 8ff410daa009c (sysdev: fix prototype for memory_sysdev_class show/store functions)
> > > in driver-core and delay it to 2.6.34?
> > 
> > Then it would need to be reverted from Linus' tree.
> 
> I have reverted commit 8ff410daa009c for today.  It looks like Greg
> already has the alternate patches queued in the driver-core tree to take
> care of this problem when it arises.
> 
> So, Greg, can you ask Linus to revert 8ff410daa009c (sysdev: fix
> prototype for memory_sysdev_class show/store functions), please?  Or
> should I?  Or should we hope he notices these emails? :-)

No, I think the patch in Linus's tree is correct, so I have fixed up my
tree now.

thanks,

greg k-h

Re: linux-next: origin tree build warning

[Greg KH]

On Tue, Jan 19, 2010 at 01:05:14PM -0800, Greg KH wrote:
> On Tue, Jan 19, 2010 at 11:12:26AM +1100, Stephen Rothwell wrote:
> > Hi Fengguang,
> > 
> > On Mon, 18 Jan 2010 16:40:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Mon, 18 Jan 2010 12:29:52 +0800 "Wu, Fengguang" <fengguang.wu@intel.com> wrote:
> > > >
> > > > On Mon, 18 Jan 2010 15:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > > >
> > > > > > It actually looks like commit c29af9636 ("sysdev: Pass attribute in
> > > > > > sysdev_class attributes show/store") referred to in the changelog for the
> > > > > > above commit has not yet been applied to Linus' tree?
> > > > >
> > > > > Commit c29af9636 ("sysdev: Pass attribute in sysdev_class attributes
> > > > > show/store") does appear in linux-next since next-20100111 (in the
> > > > > driver-core quilt series - therefore intended for 2.6.34) (it will have a
> > > > > different SHA1 today)
> > > > 
> > > > So let's queue 8ff410daa009c (sysdev: fix prototype for memory_sysdev_class show/store functions)
> > > > in driver-core and delay it to 2.6.34?
> > > 
> > > Then it would need to be reverted from Linus' tree.
> > 
> > I have reverted commit 8ff410daa009c for today.  It looks like Greg
> > already has the alternate patches queued in the driver-core tree to take
> > care of this problem when it arises.
> > 
> > So, Greg, can you ask Linus to revert 8ff410daa009c (sysdev: fix
> > prototype for memory_sysdev_class show/store functions), please?  Or
> > should I?  Or should we hope he notices these emails? :-)
> 
> No, I think the patch in Linus's tree is correct, so I have fixed up my
> tree now.

Ick, no, you are correct, Wu's patch shouldn't have been sent to Linus
yet.  I'll revert it, and then keep the fixes that were in my tree,
which should make everything safe for the .34 merge.

thanks,

greg k-h

Re: linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Greg,

On Tue, 19 Jan 2010 13:11:17 -0800 Greg KH <greg@kroah.com> wrote:
>
> Ick, no, you are correct, Wu's patch shouldn't have been sent to Linus
> yet.  I'll revert it, and then keep the fixes that were in my tree,
> which should make everything safe for the .34 merge.

Great, thanks.

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Linus,

Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

fs/nfs/super.c: In function 'nfs_follow_remote_path':
fs/nfs/super.c:2672: warning: label 'out_mntput' defined but not used

Introduced by commit e9496ff46a20a8592fdc7bdaaf41b45eb808d310 ("fix
mismerge with Trond's stuff (create_mnt_ns() export is gone now)").

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

usr/include/linux/vt.h:89: userspace cannot call function or variable defined in the kernel

Introduced by commit 5ada918b82399eef3afd6a71e3637697d6bd719f ("vt:
introduce and use vt_kmsg_redirect() function").

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi ,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

arch/x86/mm/mmio-mod.c: In function 'print_pte':
arch/x86/mm/mmio-mod.c:100: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:106: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:110: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'die_kmmio_nesting_error':
arch/x86/mm/mmio-mod.c:123: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:134: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:136: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'mmiotrace_ioremap':
arch/x86/mm/mmio-mod.c:286: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'iounmap_trace_core':
arch/x86/mm/mmio-mod.c:305: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'clear_trace_list':
arch/x86/mm/mmio-mod.c:367: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'enter_uniprocessor':
arch/x86/mm/mmio-mod.c:404: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:406: warning: too many arguments for format
arch/x86/mm/mmio-mod.c: In function 'leave_uniprocessor':
arch/x86/mm/mmio-mod.c:426: warning: too many arguments for format
arch/x86/mm/mmio-mod.c:428: warning: too many arguments for format

Caused by commit 3a0340be06a9356eb61f6804107480acbe62c069 ("x86:
mmio-mod.c: Use pr_fmt").  Was this even build tested?  The patch doesn't
even match the commit message.

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

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

Re: linux-next: origin tree build warning

[Joe Perches]

On Mon, 2009-12-14 at 10:24 +1100, Stephen Rothwell wrote:
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
> 
> arch/x86/mm/mmio-mod.c: In function 'print_pte':
> Caused by commit 3a0340be06a9356eb61f6804107480acbe62c069 ("x86:
> mmio-mod.c: Use pr_fmt").  Was this even build tested?  The patch doesn't
> even match the commit message.

Dunno how that happened, it was tested here
with #define pr_fmt(fmt) "mmiotrace: " fmt

Here's the diff necessary to make it work.

Signed-off-by: Joe Perches <joe@perches.com>

diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 4c765e9..34a3291 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -20,7 +20,7 @@
  * Derived from the read-mod example from relay-examples by Tom Zanussi.
  */
 
-#define pr_fmt(fmt) "mmiotrace: "
+#define pr_fmt(fmt) "mmiotrace: " fmt
 
 #define DEBUG 1
 

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Len,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/platform/x86/thinkpad_acpi.c:2224: warning: 'tpacpi_hotkey_driver_mask_set' defined but not used

Introduced by commit 8b468c0c85f41c4c55227c17271b4187d8911fb0
("thinkpad-acpi: add internal hotkey event API").  This entered Linus'
tree before 2.6.32-rc1.

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

drivers/scsi/ipr.c: In function 'ipr_log_enhanced_dual_ioa_error':
drivers/scsi/ipr.c:1336: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
drivers/scsi/ipr.c: In function 'ipr_log_dual_ioa_error':
drivers/scsi/ipr.c:1362: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result

Exposed by commit 0a1b71b4008d332e57b5605a8228ea7aa96687e8 ("strstrip():
mark as as must_check").

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

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Trond,

Today's linux-next build (powerpc ppc64_defconfig) produced these warnings:

fs/nfs/super.c: In function 'nfs_compare_remount_data':
fs/nfs/super.c:1852: warning: passing argument 1 of 'rpc_cmp_addr' from incompatible pointer type
include/linux/sunrpc/clnt.h:254: note: expected 'const struct sockaddr *' but argument is of type 'struct __kernel_sockaddr_storage *'
fs/nfs/super.c:1852: warning: passing argument 2 of 'rpc_cmp_addr' from incompatible pointer type
include/linux/sunrpc/clnt.h:254: note: expected 'const struct sockaddr *' but argument is of type 'struct __kernel_sockaddr_storage *'

Introduced by commit bcd2ea17da6a329a7276cde7286d802f009af332 ("NFS: Fix
port initialisation in nfs_remount()").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Dave,

Today's linux-next build (x86_64 allmodconfig, gcc 4.4.0) produced these
warnings:

net/sched/sch_api.c: In function 'qdisc_watchdog':
net/sched/sch_api.c:460: warning: initialization from incompatible pointer type
net/sched/sch_cbq.c: In function 'cbq_undelay':
net/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type

Introduced by commit ee5f9757ea17759e1ce5503bdae2b07e48e32af9
("pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer").

-- 
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: origin tree build warning

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Aug 2009 10:11:47 +1000

> Today's linux-next build (x86_64 allmodconfig, gcc 4.4.0) produced these
> warnings:
> 
> net/sched/sch_api.c: In function 'qdisc_watchdog':
> net/sched/sch_api.c:460: warning: initialization from incompatible pointer type
> net/sched/sch_cbq.c: In function 'cbq_undelay':
> net/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type
> 
> Introduced by commit ee5f9757ea17759e1ce5503bdae2b07e48e32af9
> ("pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer").

Thanks I just committed the following to clean that up.

pkt_sched: Fix bogon in tasklet_hrtimer changes.

Reported by Stephen Rothwell, luckily it's harmless:

net/sched/sch_api.c: In function 'qdisc_watchdog':
net/sched/sch_api.c:460: warning: initialization from incompatible pointer type
net/sched/sch_cbq.c: In function 'cbq_undelay':
net/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/sched/sch_api.c |    2 +-
 net/sched/sch_cbq.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index e1c2bf7..92e6f3a 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -458,7 +458,7 @@ EXPORT_SYMBOL(qdisc_warn_nonwc);
 static enum hrtimer_restart qdisc_watchdog(struct hrtimer *timer)
 {
 	struct qdisc_watchdog *wd = container_of(timer, struct qdisc_watchdog,
-						 timer);
+						 timer.timer);
 
 	wd->qdisc->flags &= ~TCQ_F_THROTTLED;
 	__netif_schedule(qdisc_root(wd->qdisc));
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 81652d6..149b040 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -593,7 +593,7 @@ static psched_tdiff_t cbq_undelay_prio(struct cbq_sched_data *q, int prio,
 static enum hrtimer_restart cbq_undelay(struct hrtimer *timer)
 {
 	struct cbq_sched_data *q = container_of(timer, struct cbq_sched_data,
-						delay_timer);
+						delay_timer.timer);
 	struct Qdisc *sch = q->watchdog.qdisc;
 	psched_time_t now;
 	psched_tdiff_t delay = 0;
-- 
1.6.4.1

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Linus,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/mfd/ab3100-core.c:563: warning: initialization from incompatible pointer type

Introduced by commit 14fa56917d73d823538151b0429d98211fa439c1 ("mfd: add
U300 AB3100 core support").

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

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

[ofa-general] linux-next: origin tree build warning

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 795 bytes --]

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

drivers/infiniband/hw/mthca/mthca_mr.c: In function 'mthca_arbel_write_mtt_seg':
drivers/infiniband/hw/mthca/mthca_mr.c:358: warning: 'dma_sync_single' is deprecated (declared at /scratch/sfr/next/include/linux/dma-mapping.h:113)
drivers/infiniband/hw/mthca/mthca_mr.c: In function 'mthca_arbel_map_phys_fmr':
drivers/infiniband/hw/mthca/mthca_mr.c:810: warning: 'dma_sync_single' is deprecated (declared at /scratch/sfr/next/include/linux/dma-mapping.h:113)

Introduced by commit dbe6f1869188b6e04e38aa861dd198befb08bcd7
("dma-mapping: mark dma_sync_single and dma_sync_sg as deprecated").

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

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

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: linux-next: origin tree build warning

[FUJITA Tomonori]

On Mon, 22 Jun 2009 11:01:13 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
> 
> drivers/infiniband/hw/mthca/mthca_mr.c: In function 'mthca_arbel_write_mtt_seg':
> drivers/infiniband/hw/mthca/mthca_mr.c:358: warning: 'dma_sync_single' is deprecated (declared at /scratch/sfr/next/include/linux/dma-mapping.h:113)
> drivers/infiniband/hw/mthca/mthca_mr.c: In function 'mthca_arbel_map_phys_fmr':
> drivers/infiniband/hw/mthca/mthca_mr.c:810: warning: 'dma_sync_single' is deprecated (declared at /scratch/sfr/next/include/linux/dma-mapping.h:113)
> 
> Introduced by commit dbe6f1869188b6e04e38aa861dd198befb08bcd7
> ("dma-mapping: mark dma_sync_single and dma_sync_sg as deprecated").

Thanks, here's a fix for this:

http://marc.info/?l=linux-kernel&m=124347325819016&w=2


The patch doesn't change the driver functionally but the driver looks
broken wrt DMA synchronization. I guess that this issue is on Roland's
todo list:

http://marc.info/?l=linux-kernel&m=124354923710600&w=2

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Linus,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/video/s1d13xxxfb.c:420: warning: 'bltbit_wait_bitset' defined but not used
drivers/video/s1d13xxxfb.c:463: warning: 'bltbit_fifo_status' defined but not used

Introduced by commit 3ed167af96ed098187ea41353fe02d1af20d38a1 ("fbdev:
s1d13xxxfb: add accelerated bitblt functions").

-- 
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: origin tree build warning

[Kristoffer Ericson]

Greetings,

Hmm, this would be true if you are using the s1d13xxxfb driver without having supported 2D accel (essentially everything not 13506). Atleast
for bltbit_wait_bitset. The bltbit_fifo_status on the other hand is needed later on
for image blitting, which is coming.

The point is basicly this, all s1d13xxxfb cards should get their 2D acceleration
going so until then this is just an annoying but harmless warning.

Hope that answers your comment.

Best wishes
Kristoffer

On Fri, 19 Jun 2009 11:13:59 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Linus,
> 
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
> 
> drivers/video/s1d13xxxfb.c:420: warning: 'bltbit_wait_bitset' defined but not used
> drivers/video/s1d13xxxfb.c:463: warning: 'bltbit_fifo_status' defined but not used
> 
> Introduced by commit 3ed167af96ed098187ea41353fe02d1af20d38a1 ("fbdev:
> s1d13xxxfb: add accelerated bitblt functions").
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 


-- 
Kristoffer Ericson <kristoffer.ericson@gmail.com>

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Ted,

Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

In file included from include/trace/ftrace.h:262,
                 from include/trace/define_trace.h:57,
                 from include/trace/events/ext4.h:720,
                 from fs/ext4/super.c:51:
include/trace/events/ext4.h: In function 'ftrace_raw_output_ext4_free_inode':
include/trace/events/ext4.h:12: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'blkcnt_t'

Introduced by commit 9bffad1ed2a003a355ed1b42424a0ae3575275ed ("ext4:
convert instrumentation from markers to tracepoints") now in Linus' tree.

-- 
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: origin tree build warning

[Stephen Rothwell]

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

On Fri, 19 Jun 2009 10:27:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next build (powerpc ppc64_defconfig) produced this warning:

I get the same warning from an x86_64 allmodconfig build as well.

> In file included from include/trace/ftrace.h:262,
>                  from include/trace/define_trace.h:57,
>                  from include/trace/events/ext4.h:720,
>                  from fs/ext4/super.c:51:
> include/trace/events/ext4.h: In function 'ftrace_raw_output_ext4_free_inode':
> include/trace/events/ext4.h:12: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'blkcnt_t'
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi all,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

arch/x86/mm/memtest.c: In function 'memtest':
arch/x86/mm/memtest.c:56: warning: comparison of distinct pointer types lacks a cast
arch/x86/mm/memtest.c:58: warning: comparison of distinct pointer types lacks a cast

Introduced by commit c9690998ef48ffefeccb91c70a7739eebdea57f9 ("x86:
memtest: remove 64-bit division").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: origin tree build warning

[Stephen Rothwell]

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

Hi Alan,

Today's linux-next build (x86_64 allmodconfig) produced this warning:

drivers/media/radio/radio-si470x.c: In function 'si470x_fops_release':
drivers/media/radio/radio-si470x.c:1217: warning: label 'unlock' defined but not used

Caused by commit ec5f5bf80501abfe2da2897cfcde8452b545aacb ("radio_si470x:
Fix free memory corruption") which removed the last reference to this
label.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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