Skip to content

Commit

Permalink
x86: reserve end-of-conventional-memory to 1MB, 64-bit, use paravirt_…
Browse files Browse the repository at this point in the history
…enabled

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>
  • Loading branch information
Alexander van Heukelum authored and Ingo Molnar committed Apr 17, 2008
1 parent 2fde61f commit ecd94c0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/x86/kernel/head64.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ static void __init reserve_ebda_region(void)
/* that area is absent. We'll just have to assume */
/* that the paravirt case can handle memory setup */
/* correctly, without our help. */
#ifdef CONFIG_PARAVIRT
if ((boot_params.hdr.version >= 0x207) &&
(boot_params.hdr.hardware_subarch != 0)) {
if (paravirt_enabled())
return;
}
#endif

/* end of low (conventional) memory */
lowmem = *(unsigned short *)__va(BIOS_LOWMEM_KILOBYTES);
Expand Down

0 comments on commit ecd94c0

Please sign in to comment.