diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/pseries/Kconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh_cache.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/firmware.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 1 |
9 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index 306a9d07491d..07fe5b69b9e2 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig | |||
@@ -34,3 +34,8 @@ config LPARCFG | |||
34 | help | 34 | help |
35 | Provide system capacity information via human readable | 35 | Provide system capacity information via human readable |
36 | <key word>=<value> pairs through a /proc/ppc64/lparcfg interface. | 36 | <key word>=<value> pairs through a /proc/ppc64/lparcfg interface. |
37 | |||
38 | config PPC_PSERIES_DEBUG | ||
39 | depends on PPC_PSERIES && PPC_EARLY_DEBUG | ||
40 | bool "Enable extra debug logging in platforms/pseries" | ||
41 | default y | ||
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index bdae04bb7a01..bd2593ed28dd 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -2,6 +2,10 @@ ifeq ($(CONFIG_PPC64),y) | |||
2 | EXTRA_CFLAGS += -mno-minimal-toc | 2 | EXTRA_CFLAGS += -mno-minimal-toc |
3 | endif | 3 | endif |
4 | 4 | ||
5 | ifeq ($(CONFIG_PPC_PSERIES_DEBUG),y) | ||
6 | EXTRA_CFLAGS += -DDEBUG | ||
7 | endif | ||
8 | |||
5 | obj-y := lpar.o hvCall.o nvram.o reconfig.o \ | 9 | obj-y := lpar.o hvCall.o nvram.o reconfig.o \ |
6 | setup.o iommu.o ras.o rtasd.o \ | 10 | setup.o iommu.o ras.o rtasd.o \ |
7 | firmware.o power.o | 11 | firmware.o power.o |
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 550b2f7d2cc1..a3fd56b186e6 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/ppc-pci.h> | 39 | #include <asm/ppc-pci.h> |
40 | #include <asm/rtas.h> | 40 | #include <asm/rtas.h> |
41 | 41 | ||
42 | #undef DEBUG | ||
43 | 42 | ||
44 | /** Overview: | 43 | /** Overview: |
45 | * EEH, or "Extended Error Handling" is a PCI bridge technology for | 44 | * EEH, or "Extended Error Handling" is a PCI bridge technology for |
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c index 1e83fcd0df31..ce37040af870 100644 --- a/arch/powerpc/platforms/pseries/eeh_cache.c +++ b/arch/powerpc/platforms/pseries/eeh_cache.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <asm/pci-bridge.h> | 28 | #include <asm/pci-bridge.h> |
29 | #include <asm/ppc-pci.h> | 29 | #include <asm/ppc-pci.h> |
30 | 30 | ||
31 | #undef DEBUG | ||
32 | 31 | ||
33 | /** | 32 | /** |
34 | * The pci address cache subsystem. This subsystem places | 33 | * The pci address cache subsystem. This subsystem places |
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c index 743d494c06dd..9d3a40f45974 100644 --- a/arch/powerpc/platforms/pseries/firmware.c +++ b/arch/powerpc/platforms/pseries/firmware.c | |||
@@ -21,7 +21,6 @@ | |||
21 | * 2 of the License, or (at your option) any later version. | 21 | * 2 of the License, or (at your option) any later version. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #undef DEBUG | ||
25 | 24 | ||
26 | #include <asm/firmware.h> | 25 | #include <asm/firmware.h> |
27 | #include <asm/prom.h> | 26 | #include <asm/prom.h> |
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index a1ab25c7082f..2b548afd1003 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -67,8 +67,6 @@ static int ras_check_exception_token; | |||
67 | static irqreturn_t ras_epow_interrupt(int irq, void *dev_id); | 67 | static irqreturn_t ras_epow_interrupt(int irq, void *dev_id); |
68 | static irqreturn_t ras_error_interrupt(int irq, void *dev_id); | 68 | static irqreturn_t ras_error_interrupt(int irq, void *dev_id); |
69 | 69 | ||
70 | /* #define DEBUG */ | ||
71 | |||
72 | 70 | ||
73 | static void request_ras_irqs(struct device_node *np, | 71 | static void request_ras_irqs(struct device_node *np, |
74 | irq_handler_t handler, | 72 | irq_handler_t handler, |
@@ -237,7 +235,7 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id) | |||
237 | printk(KERN_EMERG "Error: Fatal hardware error <0x%lx 0x%x>\n", | 235 | printk(KERN_EMERG "Error: Fatal hardware error <0x%lx 0x%x>\n", |
238 | *((unsigned long *)&ras_log_buf), status); | 236 | *((unsigned long *)&ras_log_buf), status); |
239 | 237 | ||
240 | #ifndef DEBUG | 238 | #ifndef DEBUG_RTAS_POWER_OFF |
241 | /* Don't actually power off when debugging so we can test | 239 | /* Don't actually power off when debugging so we can test |
242 | * without actually failing while injecting errors. | 240 | * without actually failing while injecting errors. |
243 | * Error data will not be logged to syslog. | 241 | * Error data will not be logged to syslog. |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 65e87951eda3..f5d29f5b13c1 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -16,8 +16,6 @@ | |||
16 | * bootup setup stuff.. | 16 | * bootup setup stuff.. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #undef DEBUG | ||
20 | |||
21 | #include <linux/cpu.h> | 19 | #include <linux/cpu.h> |
22 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
23 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index e9bc2a528e5d..9d8f8c84ab89 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -12,7 +12,6 @@ | |||
12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #undef DEBUG | ||
16 | 15 | ||
17 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 43df53c30aa0..ebebc28fe895 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #undef DEBUG | ||
13 | 12 | ||
14 | #include <linux/types.h> | 13 | #include <linux/types.h> |
15 | #include <linux/threads.h> | 14 | #include <linux/threads.h> |