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

* stable/bug.fixes-3.2:
  xen/p2m/debugfs: Fix potential pointer exception.
  xen/enlighten: Fix compile warnings.
  xen/xenbus: Check before dereferencing it.
  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,bc4cf0a710ac5daf29c09edf0ae1c42613a06797..c2de882cee735800afe6a4026edf5468e5dc781d
--- 1/arch/x86/xen/p2m.c
--- 2/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@@ -840,14 -782,13 +840,14 @@@ 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" };
+                                               "entry", "abnormal", NULL};
        static const char * const type_name[] = { "identity", "missing",
-                                               "pfn", "abnormal"};
+                                               "pfn", "abnormal", NULL};
  #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,55086e9956cfafc71a16440a7d06349e04a2c8c9..e82900fb01cdc97d1b68e2ff7b5addcf7b91710e
--- 1/drivers/xen/xen-pciback/pci_stub.c
--- 2/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@@ -513,13 -517,13 +515,13 @@@ static void kill_domain_by_device(struc
        char nodename[PCI_NODENAME_MAX];
  
        if (!psdev) {
-               dev_err(&psdev->dev->dev,
-                       "device is NULL when do AER recovery/kill_domain\n");
+               printk(KERN_ERR DRV_NAME
+                       ":device is NULL when do AER recovery/kill_domain\n");
                return;
        }
 +
        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);