Recently, a patch left DEBUG enabled in the powerpc common PCI code,
resulting in an old bug in a pr_debug() statement to show up and cause
a NULL dereference on some machines.
This fixes the pr_debug() statement and reverts to DEBUG not being
force-enabled in that file.
Signed-off-by: Benjamin Herrenschmidt <b...@kernel.crashing.org>
---
v2. Don't #undef DEBUG, just don't define it, so it can still be set
via the Makefile or other method
arch/powerpc/kernel/pci-common.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- linux-work.orig/arch/powerpc/kernel/pci-common.c 2009-02-02
12:50:12.000000000 +1100
+++ linux-work/arch/powerpc/kernel/pci-common.c 2009-02-02 14:02:56.000000000
+1100
@@ -16,8 +16,6 @@
* 2 of the License, or (at your option) any later version.
*/
-#define DEBUG
-
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/string.h>
@@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pc
} else {
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
oirq.size, oirq.specifier[0], oirq.specifier[1],
- oirq.controller->full_name);
+ oirq.controller ? oirq.controller->full_name :
+ "<default>");
virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
oirq.size);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
