summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-06-14 01:18:44 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-03 10:55:21 -0700
commit7b1866f9f35ac2042ea507559055015bf9d8271e (patch)
tree469ef7c76fec950e7640aa8957a7afe718cffa96
parenteb10d6c79f8bbbf6c64d3c1f0a8162c76c2a5bfc (diff)
s390/irq: Only define synchronize_irq() on SMP
commit 690cec8e70c211d1f5f6e520b21a68d0306173b6 upstream. In uniprocessor configurations, synchronize_irq() is defined in <linux/hardirq.h> as a macro, and this function definition fails to compile. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/s390/kernel/irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 2032846aff91..1d95be95855f 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -314,6 +314,7 @@ void measurement_alert_subclass_unregister(void)
}
EXPORT_SYMBOL(measurement_alert_subclass_unregister);
+#ifdef CONFIG_SMP
void synchronize_irq(unsigned int irq)
{
/*
@@ -322,6 +323,7 @@ void synchronize_irq(unsigned int irq)
*/
}
EXPORT_SYMBOL_GPL(synchronize_irq);
+#endif
#ifndef CONFIG_PCI