| Message ID | 20100608100020.7d79e932.randy.dunlap@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 6/8/10 10:00 AM, "Randy Dunlap" <randy.dunlap@oracle.com> wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Fix build warning on i386 (32-bit) with 32-bit dma_addr_t: > > drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov': > drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of > 'pci_alloc_consistent' from incompatible pointer type > include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but > argument is of type 'u64 *' > > Now builds without warnings on i386 and on x86_64. > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > Cc: Scott Feldman <scofeldm@cisco.com> > Cc: Vasanthy Kolluri <vkolluri@cisco.com> > Cc: Roopa Prabhu <roprabhu@cisco.com> > --- > drivers/net/enic/vnic_dev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Scott Feldman <scofeldm@cisco.com> -- 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
From: Scott Feldman <scofeldm@cisco.com> Date: Tue, 08 Jun 2010 14:55:27 -0700 > On 6/8/10 10:00 AM, "Randy Dunlap" <randy.dunlap@oracle.com> wrote: > >> From: Randy Dunlap <randy.dunlap@oracle.com> >> >> Fix build warning on i386 (32-bit) with 32-bit dma_addr_t: >> >> drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov': >> drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of >> 'pci_alloc_consistent' from incompatible pointer type >> include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but >> argument is of type 'u64 *' >> >> Now builds without warnings on i386 and on x86_64. >> >> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> >> Cc: Scott Feldman <scofeldm@cisco.com> >> Cc: Vasanthy Kolluri <vkolluri@cisco.com> >> Cc: Roopa Prabhu <roprabhu@cisco.com> >> --- >> drivers/net/enic/vnic_dev.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Scott Feldman <scofeldm@cisco.com> I'm applying this to net-2.6 since it's also a bug fix, as passing a u64 pointer in here will make pci_alloc_consistent() write garbage since it expects a dma_addr_t there which as on i386 could be 32-bit. -- 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
--- linux-next-20100608.orig/drivers/net/enic/vnic_dev.c +++ linux-next-20100608/drivers/net/enic/vnic_dev.c @@ -709,7 +709,7 @@ int vnic_dev_init_prov(struct vnic_dev * { u64 a0, a1 = len; int wait = 1000; - u64 prov_pa; + dma_addr_t prov_pa; void *prov_buf; int ret;