lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: reserve end-of-conventional-memory to 1MB, 32-bit, use paravirt_enabled

Browse Source 
Jeremy Fitzhardinge pointed out that looking at the boot_params
struct to determine if the system is running in a paravirtual
environment is not reliable for the Xen case, currently. He also
points out that there already exists a function to determine if
the system is running in a paravirtual environment. So let's use
that instead. This gets rid of the preprocessor test too.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexander van Heukelum
2008-03-04 19:57:42 +01:00
committed by Ingo Molnar
parent 0d7a1819e9
commit 2fde61fdb0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kernel/setup_32.c
View File

@@ -64,6 +64,7 @@
#include <setup_arch.h> #include <setup_arch.h>
#include <bios_ebda.h> #include <bios_ebda.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/processor.h>
/* This value is set up by the early boot code to point to the value /* This value is set up by the early boot code to point to the value
immediately after the boot time page tables. It contains a *physical* immediately after the boot time page tables. It contains a *physical*
@@ -408,12 +409,8 @@ static void __init reserve_ebda_region(void)
/* that area is absent. We'll just have to assume */ /* that area is absent. We'll just have to assume */
/* that the paravirt case can handle memory setup */ /* that the paravirt case can handle memory setup */
/* correctly, without our help. */ /* correctly, without our help. */
#ifdef CONFIG_PARAVIRT if (paravirt_enabled())
if ((boot_params.hdr.version >= 0x207) &&
(boot_params.hdr.hardware_subarch != 0)) {
return; return;
}
#endif
/* end of low (conventional) memory */ /* end of low (conventional) memory */
lowmem = *(unsigned short *)__va(BIOS_LOWMEM_KILOBYTES); lowmem = *(unsigned short *)__va(BIOS_LOWMEM_KILOBYTES);