rpms/kernel-xen-2.6/F-9 linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch, NONE, 1.1 Makefile, 1.18, 1.19 Makefile.config, 1.18, 1.19 kernel.spec, 1.40, 1.41 branch, 1.1, NONE

[Mark McLoughlin (markmc)]

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20768

Modified Files:
	Makefile Makefile.config kernel.spec 
Added Files:
	linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch 
Removed Files:
	branch 
Log Message:
* Fri Apr 25 2008 Mark McLoughlin <markmc at redhat.com>
- Fix x86_64 oops on reboot (ehabkost, #444025)


linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch:

--- NEW FILE linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch ---
>From 6cfc89e3eccabe7dfb8bb55d01deab7e0006e89f Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Fri, 25 Apr 2008 11:59:45 -0300
Subject: [PATCH] Set pvops machine_ops for Xen on x86_64 also  (MERGEME)

I don't know why this code was commented out, in the first place. Maybe
machine_ops wasn't supported on x86_64 when I started working on this
code.

This should be merged with the commit that commented out the code
(that means both commits wil probably go away :)

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/xen/enlighten.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 1a72632..5509f11 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1406,10 +1406,7 @@ asmlinkage void __init xen_start_kernel(void)
 	pv_apic_ops = xen_apic_ops;
 	pv_mmu_ops = xen_mmu_ops;
 
-#ifdef CONFIG_X86_32
-	/*FIXME: implement me! */
 	machine_ops = xen_machine_ops;
-#endif
 
 #ifdef CONFIG_SMP
 	smp_ops = xen_smp_ops;
-- 
1.5.4.1







Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-9/kernel.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kernel.spec	17 Apr 2008 08:04:30 -0000	1.40
+++ kernel.spec	25 Apr 2008 16:53:27 -0000	1.41
@@ -825,6 +825,7 @@
 Patch5149: linux-2.6-xen-0150-Mark-init-pages-read-write-again-on-free_init_pages.patch
 Patch5150: linux-2.6-xen-0151-reserve_early-kernel-text-and-data-segments.patch
 Patch5151: linux-2.6-xen-0152-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch
+Patch5152: linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch
 # kernel-xen patches end
 
 # Xen hypervisor patches (20000+)
@@ -1523,6 +1524,7 @@
 ApplyPatch linux-2.6-xen-0150-Mark-init-pages-read-write-again-on-free_init_pages.patch
 ApplyPatch linux-2.6-xen-0151-reserve_early-kernel-text-and-data-segments.patch
 ApplyPatch linux-2.6-xen-0152-Xen-Clear-__START_KERNEL_map-PTEs-on-free_init_page.patch
+ApplyPatch linux-2.6-xen-0153-Set-pvops-machine_ops-for-Xen-on-x86_64-also-MERGE.patch
 %endif
 # kernel-xen apply end
 
@@ -2132,6 +2134,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Apr 25 2008 Mark McLoughlin <markmc at redhat.com>
+- Fix x86_64 oops on reboot (ehabkost, #444025)
+
 * Thu Apr 17 2008 Mark McLoughlin <markmc at redhat.com>
 - Rebase to kernel-2_6_25-1_fc9
 


--- branch DELETED ---