diff options
author | Matthew Wilcox <matthew@wil.cx> | 2008-07-28 13:39:00 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-28 17:29:04 -0400 |
commit | cc5499c3a607a392e8a7adb934aaf14b2c6a3519 (patch) | |
tree | d7ab414b929fed34d9b15bf0c636e9591c4673dd | |
parent | 6ac665c63dcac8fcec534a1d224ecbb8b867ad59 (diff) |
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@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 3b690c3512f3..203630065839 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -270,10 +270,10 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
270 | if (!sz64) | 270 | if (!sz64) |
271 | goto fail; | 271 | goto fail; |
272 | 272 | ||
273 | if ((BITS_PER_LONG < 64) && (sz64 > 0x100000000ULL)) { | 273 | if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) { |
274 | dev_err(&dev->dev, "can't handle 64-bit BAR\n"); | 274 | dev_err(&dev->dev, "can't handle 64-bit BAR\n"); |
275 | goto fail; | 275 | goto fail; |
276 | } else if ((BITS_PER_LONG < 64) && l) { | 276 | } else if ((sizeof(resource_size_t) < 8) && l) { |
277 | /* Address above 32-bit boundary; disable the BAR */ | 277 | /* Address above 32-bit boundary; disable the BAR */ |
278 | pci_write_config_dword(dev, pos, 0); | 278 | pci_write_config_dword(dev, pos, 0); |
279 | pci_write_config_dword(dev, pos + 4, 0); | 279 | pci_write_config_dword(dev, pos + 4, 0); |