rpms/kernel/F-10 linux-2.6.27.7-vmi-fix-crash-on-boot.patch, 1.1, 1.2

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18546

Modified Files:
	linux-2.6.27.7-vmi-fix-crash-on-boot.patch 
Log Message:
official patch

linux-2.6.27.7-vmi-fix-crash-on-boot.patch:

Index: linux-2.6.27.7-vmi-fix-crash-on-boot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6.27.7-vmi-fix-crash-on-boot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27.7-vmi-fix-crash-on-boot.patch	12 Dec 2008 05:57:18 -0000	1.1
+++ linux-2.6.27.7-vmi-fix-crash-on-boot.patch	15 Dec 2008 23:33:13 -0000	1.2
@@ -1,12 +1,21 @@
-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.
+From: Zachary Amsden <zach at vmware.com>
+Date: Sat, 13 Dec 2008 20:36:58 +0000 (-0800)
+Subject: x86 Fix VMI crash on boot in 2.6.28-rc8
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ae8d04e2ecbb233926860e9ce145eac19c7835dc
+
+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 at vmware.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
 
 diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
 index b7c0dea..61e08c0 100644
@@ -33,7 +42,7 @@
 index 9d5674f..bdec76e 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -634,6 +634,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -794,6 +794,9 @@ void __init setup_arch(char **cmdline_p)
  	printk(KERN_INFO "Command line: %s\n", boot_command_line);
  #endif
  
@@ -43,7 +52,7 @@
  	early_cpu_init();
  	early_ioremap_init();
  
-@@ -707,13 +710,8 @@ void __init setup_arch(char **cmdline_p)
+@@ -880,13 +883,8 @@ void __init setup_arch(char **cmdline_p)
  	check_efer();
  #endif
  
@@ -63,7 +72,7 @@
 index 7b10933..f71f96f 100644
 --- a/arch/x86/kernel/smpboot.c
 +++ b/arch/x86/kernel/smpboot.c
-@@ -289,9 +289,7 @@ static void __cpuinit start_secondary(void *unused)
+@@ -294,9 +294,7 @@ static void __cpuinit start_secondary(void *unused)
  	 * fragile that we want to limit the things done here to the
  	 * most necessary things.
  	 */