]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Dec 2008 00:24:38 +0000 (16:24 -0800)
commitae8d04e2ecbb233926860e9ce145eac19c7835dc
treec6553749f2428e6b828af9b5a165c0ce31cb71f6
parentca7e716c7833aeaeb8fedd6d004c5f5d5e14d325
x86 Fix VMI crash on boot in 2.6.28-rc8

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>
arch/x86/include/asm/vmi.h
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c