On Tue, 17 Feb 2009 12:21:39 -0800
Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:
> On Tuesday, February 17, 2009 12:02 pm Andrew Morton wrote:
> > Something seems to have gone wrong.
> >
> > pci-constify-pci_bus_assign_resources.patch also did this:
> >
> > --- a/drivers/pci/setup-bus.c~pci-constify-pci_bus_assign_resources
> > +++ a/drivers/pci/setup-bus.c
> > @@ -27,7 +27,7 @@
> > #include <linux/slab.h>
> >
> >
> > -static void pbus_assign_resources_sorted(struct pci_bus *bus)
> > +static void pbus_assign_resources_sorted(const struct pci_bus *bus)
> > {
> > struct pci_dev *dev;
> > struct resource *res;
> >
> > but that hunk got lost and we now get
> >
> > drivers/pci/setup-bus.c: In function 'pci_bus_assign_resources':
> > drivers/pci/setup-bus.c:503: warning: passing argument 1 of
> > 'pbus_assign_resources_sorted' discards qualifiers from pointer target type
>
> Hm the patch I applied from you didn't have that hunk (just checked my
> mailbox), did I pick up the wrong one?
>
Beats me - I dunno what email you looked at. Here's the most recent email:
Return-Path: <akpm@xxxxxxxxxxxxxxxxxxxx>
X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on y.localdomain
X-Spam-Level:
X-Spam-Status: No, score=-1.3 required=5.0 tests=ALL_TRUSTED,AWL autolearn=ham
version=3.2.4
Received: from y.localdomain (y.localdomain [127.0.0.1])
by y.localdomain (8.14.2/8.14.2) with ESMTP id n1BLU4xZ017085
for <akpm@localhost>; Wed, 11 Feb 2009 13:30:26 -0800
Received: from imap1.linux-foundation.org [140.211.169.55]
by y.localdomain with IMAP (fetchmail-6.3.8)
for <akpm@localhost> (single-drop); Wed, 11 Feb 2009 13:30:26 -0800 (PST)
Received: from localhost.localdomain (localhost [127.0.0.1])
by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n1BLT4WU001661;
Wed, 11 Feb 2009 13:29:04 -0800
Message-Id: <200902112129.n1BLT4WU001661@xxxxxxxxxxxxxxxxxxxxxxxxxx>
Subject: [patch 3/6] pci: constify pci_bus_assign_resources()
To: jbarnes@xxxxxxxxxxxxxxxx
Cc: linux-pci@xxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 11 Feb 2009 13:29:04 -0800
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
drivers/pci/hotplug/fakephp.c: In function 'pci_rescan_bus':
drivers/pci/hotplug/fakephp.c:271: warning: passing argument 1 of 'pci_bus_assign_resources' discards qualifiers from pointer target type
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/setup-bus.c | 4 ++--
include/linux/pci.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/pci/setup-bus.c~pci-constify-pci_bus_assign_resources drivers/pci/setup-bus.c
--- a/drivers/pci/setup-bus.c~pci-constify-pci_bus_assign_resources
+++ a/drivers/pci/setup-bus.c
@@ -27,7 +27,7 @@
#include <linux/slab.h>
-static void pbus_assign_resources_sorted(struct pci_bus *bus)
+static void pbus_assign_resources_sorted(const struct pci_bus *bus)
{
struct pci_dev *dev;
struct resource *res;
@@ -495,7 +495,7 @@ void __ref pci_bus_size_bridges(struct p
}
EXPORT_SYMBOL(pci_bus_size_bridges);
-void __ref pci_bus_assign_resources(struct pci_bus *bus)
+void __ref pci_bus_assign_resources(const struct pci_bus *bus)
{
struct pci_bus *b;
struct pci_dev *dev;
diff -puN include/linux/pci.h~pci-constify-pci_bus_assign_resources include/linux/pci.h
--- a/include/linux/pci.h~pci-constify-pci_bus_assign_resources
+++ a/include/linux/pci.h
@@ -708,7 +708,7 @@ ssize_t pci_write_vpd(struct pci_dev *de
int pci_vpd_truncate(struct pci_dev *dev, size_t size);
/* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
-void pci_bus_assign_resources(struct pci_bus *bus);
+void pci_bus_assign_resources(const struct pci_bus *bus);
void pci_bus_size_bridges(struct pci_bus *bus);
int pci_claim_resource(struct pci_dev *, int);
void pci_assign_unassigned_resources(void);
_
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
