diff options
Diffstat (limited to 'arch/ppc/kernel/irq.c')
-rw-r--r-- | arch/ppc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c index 772e428aaa59..fbb2b9f8922c 100644 --- a/arch/ppc/kernel/irq.c +++ b/arch/ppc/kernel/irq.c | |||
@@ -126,7 +126,7 @@ skip: | |||
126 | seq_puts(p, " PowerPC Thermal Assist (cpu temp)\n"); | 126 | seq_puts(p, " PowerPC Thermal Assist (cpu temp)\n"); |
127 | } | 127 | } |
128 | #endif | 128 | #endif |
129 | #ifdef CONFIG_SMP | 129 | #if defined(CONFIG_SMP) && !defined(CONFIG_PPC_MERGE) |
130 | /* should this be per processor send/receive? */ | 130 | /* should this be per processor send/receive? */ |
131 | seq_printf(p, "IPI (recv/sent): %10u/%u\n", | 131 | seq_printf(p, "IPI (recv/sent): %10u/%u\n", |
132 | atomic_read(&ipi_recv), atomic_read(&ipi_sent)); | 132 | atomic_read(&ipi_recv), atomic_read(&ipi_sent)); |