Skip to contentSkip to conversation

(xen) stable/bug-fixes-rc4 for 2.6.39-rc4.

GIT PULL Konrad Rzeszutek Wilk 1 participant 1 message Apr 20, 2011

lore
Share & tools
lore
#0 lore raw

Linus,

Please git pull

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/bug-fixes-rc4

since git commit f0e615c3cb72b42191b558c130409335812621d8 Linus Torvalds (1)

    Linux 2.6.39-rc4

These are two patches that came about the patch introduced at the beginning of 2.6.39 ("x86-64, mm: Put early page table high" 4b239f458c229de044d6905c2b0f9fe16ed9e01e). With the two patches, one fixes booting of Linux with Xen hypervisor on a machine with an "gap" in the E820 right after 3.8GB to 4GB, while the other fixes booting of a 32-bit guest.

There is one more patch that we have been carrying in tree to fix the regression introduced by "x86-64,mm: Put early page table high" which is not yet ready - but hopefully will be at the end of the week, which will likely go through the x86 tree.

Anyhow please pull these two following patches:

Stefano Stabellini (2):
xen: do not create the extra e820 region at an addr lower than 4G
xen: mask_rw_pte: do not apply the early_ioremap checks on x86_32

 arch/x86/xen/mmu.c   |   13 +++++++++----
 arch/x86/xen/setup.c |    2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)