x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
authorYinghai Lu <yinghai@kernel.org>
Sat, 18 Apr 2009 08:43:46 +0000 (01:43 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 22 Apr 2009 20:56:26 +0000 (13:56 -0700)
e820_all_mapped need end is (addr + size) instead of (addr + size - 1)

Cc: stable@kernel.org
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
arch/x86/pci/mmconfig-shared.c

index 905bb526b13350e88e258c69162240f5e99fbee3..5fa10bb9604f5efe9c18f58fc21b95bea5c5bed2 100644 (file)
@@ -375,7 +375,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
                if (!fixmem32)
                        return AE_OK;
                if ((mcfg_res->start >= fixmem32->address) &&
-                   (mcfg_res->end < (fixmem32->address +
+                   (mcfg_res->end <= (fixmem32->address +
                                      fixmem32->address_length))) {
                        mcfg_res->flags = 1;
                        return AE_CTRL_TERMINATE;
@@ -392,7 +392,7 @@ static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
                return AE_OK;
 
        if ((mcfg_res->start >= address.minimum) &&
-           (mcfg_res->end < (address.minimum + address.address_length))) {
+           (mcfg_res->end <= (address.minimum + address.address_length))) {
                mcfg_res->flags = 1;
                return AE_CTRL_TERMINATE;
        }
@@ -439,7 +439,7 @@ static int __init is_mmconf_reserved(check_reserved_t is_reserved,
        u64 old_size = size;
        int valid = 0;
 
-       while (!is_reserved(addr, addr + size - 1, E820_RESERVED)) {
+       while (!is_reserved(addr, addr + size, E820_RESERVED)) {
                size >>= 1;
                if (size < (16UL<<20))
                        break;