Commit cfd74486 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: p2m: correctly initialize partial p2m leaf
  xen: fix non-ANSI function warning in irq.c
parents a1d3f5b7 8e1b4cf2

arch/x86/xen/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -237,6 +237,24 @@ void __init xen_build_dynamic_phys_to_machine(void) 
			p2m_top[topidx] = mid;

		}



		/*

		 * 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];

	}