- Update to 3.3-rc2.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / kernel / e820.c

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 62d61e9..664d1a7 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -935,7 +935,8 @@ void __init e820_reserve_resources(void)
                 * pcibios_resource_survey()
                 */
                if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20)) {
-                       res->flags |= IORESOURCE_BUSY;
+                       if (e820.map[i].type != E820_NVS)
+                               res->flags |= IORESOURCE_BUSY;
                        insert_resource(&iomem_resource, res);
                }
                res++;