x86 Fix VMI crash on boot in 2.6.28-rc8
authorZachary Amsden <zach@vmware.com>
Sat, 13 Dec 2008 20:36:58 +0000 (12:36 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 18 Dec 2008 17:13:36 +0000 (09:13 -0800)
commitfeb374144807f9d83d48930c3bae32005441230f
tree4dfb87b2edaf5fe7d73589b8eac0492975219384
parentd9a888b061f55534016d2d86a21639948312a117
x86 Fix VMI crash on boot in 2.6.28-rc8

commit ae8d04e2ecbb233926860e9ce145eac19c7835dc upstream.

VMI initialiation can relocate the fixmap, causing early_ioremap to
malfunction if it is initialized before the relocation.  To fix this,
VMI activation is split into two phases; the detection, which must
happen before setting up ioremap, and the activation, which must happen
after parsing early boot parameters.

This fixes a crash on boot when VMI is enabled under VMware.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
include/asm-x86/vmi.h