]> err.no Git - linux-2.6/commitdiff
PCI: handle 64-bit resources better on 32-bit machines
authorMatthew Wilcox <matthew@wil.cx>
Mon, 28 Jul 2008 17:39:00 +0000 (13:39 -0400)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 28 Jul 2008 21:29:04 +0000 (14:29 -0700)
If the kernel is configured to support 64-bit resources on a 32-bit
machine, we can support 64-bit BARs properly.  Just change the condition
to check sizeof(resource_size_t) instead of BITS_PER_LONG.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/probe.c

index 3b690c3512f36629d611c1b3d35a4cc789789c82..2036300658394458b2f77b46f975a661e36d1950 100644 (file)
@@ -270,10 +270,10 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                if (!sz64)
                        goto fail;
 
-               if ((BITS_PER_LONG < 64) && (sz64 > 0x100000000ULL)) {
+               if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {
                        dev_err(&dev->dev, "can't handle 64-bit BAR\n");
                        goto fail;
-               } else if ((BITS_PER_LONG < 64) && l) {
+               } else if ((sizeof(resource_size_t) < 8) && l) {
                        /* Address above 32-bit boundary; disable the BAR */
                        pci_write_config_dword(dev, pos, 0);
                        pci_write_config_dword(dev, pos + 4, 0);