diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-02-10 04:20:11 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 20:47:17 -0500 |
commit | 9ad3f2c7c69659c343843393944d739fec1f2e73 (patch) | |
tree | b1eef2d30a70d8386c3fdfe8bd73cf15de657f8c /arch/x86/pci/bus_numa.c | |
parent | 97445c3b86e0b64e059b4829a7193f8e26fb5bfc (diff) |
x86/pci: Add cap_resource()
Prepare for 32bit pci root bus
-v2: hpa said we should compare with (resource_size_t)~0
-v3: according to Linus to use MAX_RESOURCE instead.
also need need to put related patches together
-v4: according to Andrew, use min in cap_resource()
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-8-git-send-email-yinghai@kernel.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/pci/bus_numa.c')
-rw-r--r-- | arch/x86/pci/bus_numa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c index 3411687b676e..3510778aa8bb 100644 --- a/arch/x86/pci/bus_numa.c +++ b/arch/x86/pci/bus_numa.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
3 | #include <linux/range.h> | ||
3 | 4 | ||
4 | #include "bus_numa.h" | 5 | #include "bus_numa.h" |
5 | 6 | ||
@@ -55,6 +56,9 @@ void __devinit update_res(struct pci_root_info *info, resource_size_t start, | |||
55 | if (start > end) | 56 | if (start > end) |
56 | return; | 57 | return; |
57 | 58 | ||
59 | if (start == MAX_RESOURCE) | ||
60 | return; | ||
61 | |||
58 | if (!merge) | 62 | if (!merge) |
59 | goto addit; | 63 | goto addit; |
60 | 64 | ||