mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
powerpc: Fix oops on some machines due to incorrect pr_debug()
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 <benh@kernel.crashing.org>
This commit is contained in:
parent
309ea626b1
commit
59b608c2c3
1 changed files with 2 additions and 3 deletions
|
@ -16,8 +16,6 @@
|
||||||
* 2 of the License, or (at your option) any later version.
|
* 2 of the License, or (at your option) any later version.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define DEBUG
|
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
|
@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
|
||||||
} else {
|
} else {
|
||||||
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
|
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
|
||||||
oirq.size, oirq.specifier[0], oirq.specifier[1],
|
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,
|
virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
|
||||||
oirq.size);
|
oirq.size);
|
||||||
|
|
Loading…
Reference in a new issue