Merge branch 'x86/generalize-visws' into x86/core

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 9f5002e0b35c..a5383ae2cbe3 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1313,6 +1313,11 @@ void __init e820_reserve_resources(void)
         }
 }
 
+/*
+ * Non-standard memory setup can be specified via this quirk:
+ */
+char * (*arch_memory_setup_quirk)(void);
+
 char *__init default_machine_specific_memory_setup(void)
 {
         char *who = "BIOS-e820";
@@ -1353,6 +1358,12 @@ char *__init default_machine_specific_memory_setup(void)
 
 char *__init __attribute__((weak)) machine_specific_memory_setup(void)
 {
+        if (arch_memory_setup_quirk) {
+                char *who = arch_memory_setup_quirk();
+
+                if (who)
+                        return who;
+        }
         return default_machine_specific_memory_setup();
 }