2.6.37-rc3 regression and a bug-fix for Xen subsystem.
Subsystems (2)
Dear Linus,
Please pull the following git tree:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-linus
which has changes since git commit e53beacd23d9cb47590da6a7a7f6d417b941a994:
Linus Torvalds (1):
Linux 2.6.37-rc2
The tree has two patches: one of them is innocuous removal of
a #include, while the other fixes a regression. Right after the merge window opened for 2.6.37, 32-bit PAE Xen PV guests were not able to boot. Ian Campbell came up with a nice fix that had been posted way back in October but we completely forgot about the fix until about a week ago.
Huang Weiyi (1):
xen: remove duplicated #include
Ian Campbell (1):
xen: x86/32: perform initial startup on initial_page_table
arch/x86/xen/enlighten.c | 2 - arch/x86/xen/mmu.c | 69 +++++++++++++++++++++++++++++++++++++-------- arch/x86/xen/setup.c | 1 - 3 files changed, 56 insertions(+), 16 deletions(-)
And the two patchs together:
arch/x86/xen/enlighten.c +0 -2
@@ -1191,8 +1191,6 @@ asmlinkage void __init xen_start_kernel(void)/* Allocate and initialize top and mid mfn levels for p2m structure */ xen_build_mfn_list_list (); - init_mm.pgd = pgd; -/* keep using Xen gdt for now; no urgent need to change it */ #ifdef CONFIG_X86_32
arch/x86/xen/mmu.c +56 -13
107 lines not on this page · raw message
arch/x86/xen/setup.c +0 -1
@@ -23,7 +23,6 @@#include <xen/interface/callback.h> #include <xen/interface/memory.h> #include <xen/interface/physdev.h> -#include <xen/interface/memory.h> #include <xen/features.h> #include "xen-ops.h"