Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel...

* 'stable/bug.fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/p2m/debugfs: Make type_name more obvious.
  xen/p2m/debugfs: Fix potential pointer exception.
  xen/enlighten: Fix compile warnings and set cx to known value.
  xen/xenbus: Remove the unnecessary check.
  xen/irq: If we fail during msi_capability_init return proper error code.
  xen/events: Don't check the info for NULL as it is already done.
  xen/events: BUG() when we can't allocate our event->irq array.

* 'stable/mmu.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Fix selfballooning and ensure it doesn't go too far
  xen/gntdev: Fix sleep-inside-spinlock
  xen: modify kernel mappings corresponding to granted pages
  xen: add an "highmem" parameter to alloc_xenballooned_pages
  xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
  xen/p2m: Make debug/xen/mmu/p2m visible again.
  Revert "xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag set."

diff --cc arch/x86/include/asm/xen/page.h
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge

diff --cc arch/x86/xen/p2m.c
index 58efeb9d5440b75d2fd6d3cb5880f4ddd2729130,795e003517e19c62913003d13fa78095e76d15df,a8ee9a45c3593a4e9138e0536ec17a9d5ff65b25..1b267e75158d8d29d888788d0ac12da38a719a34
--- 1/arch/x86/xen/p2m.c
--- 2/arch/x86/xen/p2m.c
--- 3/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@@@ -782,13 -782,11 -840,14 +840,12 @@@@ unsigned long m2p_find_override_pfn(uns
   EXPORT_SYMBOL_GPL(m2p_find_override_pfn);
   
   #ifdef CONFIG_XEN_DEBUG_FS
-- 
-- int p2m_dump_show(struct seq_file *m, void *v)
++ #include <linux/debugfs.h>
++ #include "debugfs.h"
++ static int p2m_dump_show(struct seq_file *m, void *v)
   {
        static const char * const level_name[] = { "top", "middle",
- -                                             "entry", "abnormal" };
- -     static const char * const type_name[] = { "identity", "missing",
- -                                             "pfn", "abnormal"};
+ +                                             "entry", "abnormal", "error"};
   #define TYPE_IDENTITY 0
   #define TYPE_MISSING 1
   #define TYPE_PFN 2

diff --cc drivers/xen/balloon.c
Simple merge

diff --cc drivers/xen/xen-selfballoon.c
index 6ea852e251629518cc8d808a087bbc9d4c87fb31,6ea852e251629518cc8d808a087bbc9d4c87fb31,ff3f2e423af409baa3feb7ea3edcfcd2876c0458..d93c70857e03ce4645a267634f8ee5e18059594e
--- 1/drivers/xen/xen-selfballoon.c
--- 2/drivers/xen/xen-selfballoon.c
--- 3/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@@@ -68,9 -68,9 -68,10 +68,11 @@@@
    */
   
   #include <linux/kernel.h>
++ #include <linux/bootmem.h>
++ #include <linux/swap.h>
   #include <linux/mm.h>
   #include <linux/mman.h>
  +#include <linux/module.h>
   #include <linux/workqueue.h>
   #include <xen/balloon.h>
   #include <xen/tmem.h>