diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 14e293edd23f..fd639d9f79b6 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include <setup_arch.h> | 64 | #include <setup_arch.h> |
65 | #include <bios_ebda.h> | 65 | #include <bios_ebda.h> |
66 | #include <asm/cacheflush.h> | 66 | #include <asm/cacheflush.h> |
67 | #include <asm/processor.h> | ||
67 | 68 | ||
68 | /* This value is set up by the early boot code to point to the value | 69 | /* This value is set up by the early boot code to point to the value |
69 | immediately after the boot time page tables. It contains a *physical* | 70 | immediately after the boot time page tables. It contains a *physical* |
@@ -408,12 +409,8 @@ static void __init reserve_ebda_region(void) | |||
408 | /* that area is absent. We'll just have to assume */ | 409 | /* that area is absent. We'll just have to assume */ |
409 | /* that the paravirt case can handle memory setup */ | 410 | /* that the paravirt case can handle memory setup */ |
410 | /* correctly, without our help. */ | 411 | /* correctly, without our help. */ |
411 | #ifdef CONFIG_PARAVIRT | 412 | if (paravirt_enabled()) |
412 | if ((boot_params.hdr.version >= 0x207) && | ||
413 | (boot_params.hdr.hardware_subarch != 0)) { | ||
414 | return; | 413 | return; |
415 | } | ||
416 | #endif | ||
417 | 414 | ||
418 | /* end of low (conventional) memory */ | 415 | /* end of low (conventional) memory */ |
419 | lowmem = *(unsigned short *)__va(BIOS_LOWMEM_KILOBYTES); | 416 | lowmem = *(unsigned short *)__va(BIOS_LOWMEM_KILOBYTES); |