From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, linux-usb-devel@lists.sourceforge.net
Subject: [patch 07/18] fix drivers/pci/probe.c warning
Date: Thu, 22 Sep 2005 00:48:19 -0700 [thread overview]
Message-ID: <20050922074818.GH15053@kroah.com> (raw)
In-Reply-To: <20050922074643.GA15053@kroah.com>
[-- Attachment #1: pci-fix-probe-warning.patch --]
[-- Type: text/plain, Size: 1744 bytes --]
From: Amos Waterland <apw@us.ibm.com>
This function expects an unsigned 32-bit type as its third argument:
static u32 pci_size(u32 base, u32 maxbase, u32 mask)
However, given these definitions:
#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
these two calls in drivers/pci/probe.c are problematic for architectures
for which a UL is not equivalent to a u32:
sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK);
sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK);
Hence the below compile warning when building for ARCH=ppc64:
drivers/pci/probe.c: In function `pci_read_bases':
/.../probe.c:168: warning: large integer implicitly truncated to unsigned type
/.../probe.c:218: warning: large integer implicitly truncated to unsigned type
Here is a simple fix.
Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/pci/probe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- scsi-2.6.orig/drivers/pci/probe.c 2005-09-20 05:59:55.000000000 -0700
+++ scsi-2.6/drivers/pci/probe.c 2005-09-21 17:29:32.000000000 -0700
@@ -165,7 +165,7 @@
if (l == 0xffffffff)
l = 0;
if ((l & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY) {
- sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK);
+ sz = pci_size(l, sz, (u32)PCI_BASE_ADDRESS_MEM_MASK);
if (!sz)
continue;
res->start = l & PCI_BASE_ADDRESS_MEM_MASK;
@@ -215,7 +215,7 @@
if (l == 0xffffffff)
l = 0;
if (sz && sz != 0xffffffff) {
- sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK);
+ sz = pci_size(l, sz, (u32)PCI_ROM_ADDRESS_MASK);
if (sz) {
res->flags = (l & IORESOURCE_ROM_ENABLE) |
IORESOURCE_MEM | IORESOURCE_PREFETCH |
--
next prev parent reply other threads:[~2005-09-22 7:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050922003901.814147000@echidna.kroah.org>
2005-09-22 7:46 ` [patch 00/18] USB and PCI Fixes for 2.6.14-rc2 Greg KH
2005-09-22 7:47 ` [patch 01/18] Driver Core: fis bus rescan devices race Greg KH
2005-09-22 7:47 ` [patch 02/18] Driver Core: add helper device_is_registered() Greg KH
2005-09-22 7:47 ` [patch 03/18] fix class symlinks in sysfs Greg KH
2005-09-22 7:47 ` [patch 04/18] I2C: remove me from the MAINTAINERS file for i2c Greg Kroah-Hartman
2005-09-22 7:48 ` [patch 05/18] PCI: remove unused "scratch" Greg KH
2005-09-22 7:48 ` [patch 06/18] PCI: convert kcalloc to kzalloc Greg KH
2005-09-22 7:48 ` Greg KH [this message]
2005-09-22 7:48 ` [patch 08/18] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c Greg KH
2005-09-22 7:48 ` [patch 09/18] ub: fix burning cds Greg KH
2005-09-22 7:48 ` [patch 10/18] USB: more device IDs for Option card driver Greg KH
2005-09-22 7:48 ` [patch 11/18] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR Greg KH
2005-09-22 7:48 ` [patch 12/18] USB: fix pxa2xx_udc compile warnings Greg KH
2005-09-22 7:49 ` [patch 13/18] USB: sl811-hcd minor fixes Greg KH
2005-09-22 7:49 ` [patch 14/18] USB: fix pegasus driver Greg KH
2005-09-22 7:49 ` [patch 15/18] usb/serial/option.c: Increase input buffer size Greg KH
2005-09-22 7:49 ` [patch 16/18] USB: Add Novatel CDMA Wireless PC card IDs to airprime Greg KH
2005-09-22 7:49 ` [patch 17/18] ub: Comment out unconditional stall clear Greg KH
2005-09-22 7:49 ` [patch 18/18] USB: Update Documentation/usb/URB.txt Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050922074818.GH15053@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).