From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 07:17:47 +0000 (+0200)
Subject: Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=31018acd4c77f0e4b90f870011249f32c5e3d5b6;p=openwrt%2Fstaging%2Fblogic.git

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

* '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."
---

31018acd4c77f0e4b90f870011249f32c5e3d5b6
diff --cc arch/x86/xen/p2m.c
index 58efeb9d5440,795e003517e1,a8ee9a45c359..1b267e75158d
--- a/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/xen-selfballoon.c
index 6ea852e25162,6ea852e25162,ff3f2e423af4..d93c70857e03
--- a/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>