[Xen-changelog] [linux-2.6.18-xen] Backport: PCI: handle 64-bit resources better on 32-bit machines

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236930010 0
# Node ID 31f138db8eef280cff353604736a3113c7be6835
# Parent  bca9d4cfbca27ddd955c533367a11a20062fdce5
Backport: PCI: handle 64-bit resources better on 32-bit machines

    commit cc5499c3a607a392e8a7adb934aaf14b2c6a3519
    Author: Matthew Wilcox <matthew@xxxxxx>
    Date:   Mon Jul 28 13:39:00 2008 -0400

    PCI: handle 64-bit resources better on 32-bit machines

    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@xxxxxxxxxxxxxxx>
    Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

Signed-off-by: Yu Zhao <yu.zhao@xxxxxxxxx>
---
 drivers/pci/probe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r bca9d4cfbca2 -r 31f138db8eef drivers/pci/probe.c
--- a/drivers/pci/probe.c       Fri Mar 13 07:39:48 2009 +0000
+++ b/drivers/pci/probe.c       Fri Mar 13 07:40:10 2009 +0000
@@ -230,10 +230,10 @@ static int __pci_read_base(struct pci_de
                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);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog