From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 29 Sep 2011 21:23:29 +0000 (-0400)
Subject: Merge branch 'stable/bug.fixes-3.2' into linux-next
X-Git-Tag: next-20110930~15^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3ff69a4704245a8de1fe5c3ee9906cbabbf58e1;p=karo-tx-linux.git

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
---

a3ff69a4704245a8de1fe5c3ee9906cbabbf58e1
diff --cc arch/x86/xen/p2m.c
index a8ee9a45c359,bc4cf0a710ac..c2de882cee73
--- a/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/xen-pciback/pci_stub.c
index 1b474804180a,55086e9956cf..e82900fb01cd
--- a/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);