xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ingo Molnar
2008-07-11 21:22:18 +02:00
parent 5b4d2386c2 39415a440e
commit 6c82a000a2
36 changed files with 865 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/e820.c
View File

@@ -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();
}