Merge branch 'stable/bug.fixes-3.2' into linux-next

* stable/bug.fixes-3.2:
  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.
  xen/pciback: Check if the device is found instead of blindly assuming so.
  xen/pciback: Return proper error code from sscanf.
  xen/pciback: Do not dereference psdev during printk when it is NULL.

Conflicts:
	drivers/xen/xen-pciback/pci_stub.c

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

diff --cc arch/x86/xen/p2m.c
index a8ee9a45c3593a4e9138e0536ec17a9d5ff65b25,795e003517e19c62913003d13fa78095e76d15df..1b267e75158d8d29d888788d0ac12da38a719a34
--- 1/arch/x86/xen/p2m.c
--- 2/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@@ -840,14 -782,11 +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/events.c
Simple merge

diff --cc drivers/xen/xen-pciback/pci_stub.c
index 1b474804180a230b1d943bd9be49ed6225479ccf,7beb50582486d9b078bde45806f7310f4932b379..2ab656a04a5f8dea05fef8b11c7fd73c70d204e9
--- 1/drivers/xen/xen-pciback/pci_stub.c
--- 2/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@@ -512,14 -516,10 +514,9 @@@ static void kill_domain_by_device(struc
        int err;
        char nodename[PCI_NODENAME_MAX];
  
-       if (!psdev) {
-               dev_err(&psdev->dev->dev,
-                       "device is NULL when do AER recovery/kill_domain\n");
-               return;
-       }
- 
+       BUG_ON(!psdev);
        snprintf(nodename, PCI_NODENAME_MAX, "/local/domain/0/backend/pci/%d/0",
                psdev->pdev->xdev->otherend_id);
 -      nodename[strlen(nodename)] = '\0';
  
  again:
        err = xenbus_transaction_start(&xbt);