git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit

author	Zachary Amsden <zach@vmware.com>
	Sat, 13 Dec 2008 20:36:58 +0000 (12:36 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 15 Dec 2008 00:24:38 +0000 (16:24 -0800)
commit	ae8d04e2ecbb233926860e9ce145eac19c7835dc
tree	c6553749f2428e6b828af9b5a165c0ce31cb71f6	tree
parent	ca7e716c7833aeaeb8fedd6d004c5f5d5e14d325	commit \| diff

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		diff \| blob \| blame \| history
arch/x86/kernel/setup.c		diff \| blob \| blame \| history
arch/x86/kernel/smpboot.c		diff \| blob \| blame \| history
arch/x86/kernel/vmi_32.c		diff \| blob \| blame \| history