|
@@ -970,7 +970,8 @@ static const char *__init e820_type_to_string(struct e820_entry *entry)
|
|
|
case E820_TYPE_UNUSABLE: return "Unusable memory";
|
|
|
case E820_TYPE_PRAM: return "Persistent Memory (legacy)";
|
|
|
case E820_TYPE_PMEM: return "Persistent Memory";
|
|
|
- default: return "Reserved";
|
|
|
+ case E820_TYPE_RESERVED: return "Reserved";
|
|
|
+ default: return "Unknown E820 type";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -984,6 +985,7 @@ static unsigned long __init e820_type_to_iomem_type(struct e820_entry *entry)
|
|
|
case E820_TYPE_UNUSABLE: /* Fall-through: */
|
|
|
case E820_TYPE_PRAM: /* Fall-through: */
|
|
|
case E820_TYPE_PMEM: /* Fall-through: */
|
|
|
+ case E820_TYPE_RESERVED: /* Fall-through: */
|
|
|
default: return IORESOURCE_MEM;
|
|
|
}
|
|
|
}
|
|
@@ -998,11 +1000,12 @@ static unsigned long __init e820_type_to_iores_desc(struct e820_entry *entry)
|
|
|
case E820_TYPE_RESERVED_KERN: /* Fall-through: */
|
|
|
case E820_TYPE_RAM: /* Fall-through: */
|
|
|
case E820_TYPE_UNUSABLE: /* Fall-through: */
|
|
|
+ case E820_TYPE_RESERVED: /* Fall-through: */
|
|
|
default: return IORES_DESC_NONE;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static bool __init do_mark_busy(u32 type, struct resource *res)
|
|
|
+static bool __init do_mark_busy(enum e820_type type, struct resource *res)
|
|
|
{
|
|
|
/* this is the legacy bios/dos rom-shadow + mmio region */
|
|
|
if (res->start < (1ULL<<20))
|
|
@@ -1017,6 +1020,11 @@ static bool __init do_mark_busy(u32 type, struct resource *res)
|
|
|
case E820_TYPE_PRAM:
|
|
|
case E820_TYPE_PMEM:
|
|
|
return false;
|
|
|
+ case E820_TYPE_RESERVED_KERN:
|
|
|
+ case E820_TYPE_RAM:
|
|
|
+ case E820_TYPE_ACPI:
|
|
|
+ case E820_TYPE_NVS:
|
|
|
+ case E820_TYPE_UNUSABLE:
|
|
|
default:
|
|
|
return true;
|
|
|
}
|