Skip to contentSkip to conversation

(xen) stable/bug-fixes-rc1

GIT PULL Konrad Rzeszutek Wilk 1 participant 1 message Jan 21, 2011

Subsystems (2)
x86 Xen hypervisor x86
lore
Share & tools
lore

Konrad Rzeszutek Wilk

author
#0 lore raw

Hello Linus,

Please pull from:

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

changes since git commit c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 Linus Torvalds (1):

    Linux 2.6.38-rc1

This git pull includes a bootup fix found by Canonical during their kernel rollout, and also a warning found by Randy during his compile shakedown.

Randy Dunlap (1):
xen: fix non-ANSI function warning in irq.c

Stefan Bader (1):
xen: p2m: correctly initialize partial p2m leaf

 arch/x86/xen/irq.c |    2 +-
 arch/x86/xen/p2m.c |   20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)
arch/x86/xen/irq.c +1 -1
index 9d30105..6a6fe89 100644
@@ -126,7 +126,7 @@ static const struct pv_irq_ops xen_irq_ops __initdata = {
 #endif
 };
 
-void __init xen_init_irq_ops()
+void __init xen_init_irq_ops(void)
 {
 	pv_irq_ops = xen_irq_ops;
 	x86_init.irqs.intr_init = xen_init_IRQ;
arch/x86/xen/p2m.c +19 -1
index 8f2251d..ddc81a0 100644
@@ -237,7 +237,25 @@ void __init xen_build_dynamic_phys_to_machine(void)
 			p2m_top[topidx] = mid;
 		}
 
-		p2m_top[topidx][mididx] = &mfn_list[pfn];
+		/*
+		 * As long as the mfn_list has enough entries to completely
+		 * fill a p2m page, pointing into the array is ok. But if
+		 * not the entries beyond the last pfn will be undefined.
+		 * And guessing that the 'what-ever-there-is' does not take it
+		 * too kindly when changing it to invalid markers, a new page
+		 * is allocated, initialized and filled with the valid part.
+		 */
+		if (unlikely(pfn + P2M_PER_PAGE > max_pfn)) {
+			unsigned long p2midx;
+			unsigned long *p2m = extend_brk(PAGE_SIZE, PAGE_SIZE);
+			p2m_init(p2m);
+
+			for (p2midx = 0; pfn + p2midx < max_pfn; p2midx++) {
+				p2m[p2midx] = mfn_list[pfn + p2midx];
+			}
+			p2m_top[topidx][mididx] = p2m;
+		} else
+			p2m_top[topidx][mididx] = &mfn_list[pfn];
 	}
 
 	m2p_override_init();