From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Jun 2013 19:02:26 +0000 (-0700)
Subject: remove s390 3.9-stable patch
X-Git-Tag: v3.9.7~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=579f4be4e5a4e86481205d69b35e6277a24cdb5d;p=thirdparty%2Fkernel%2Fstable-queue.git

remove s390 3.9-stable patch
---

diff --git a/queue-3.9/s390-pci-implement-irq-functions-if-pci.patch b/queue-3.9/s390-pci-implement-irq-functions-if-pci.patch
deleted file mode 100644
index 06946320cc7..00000000000
--- a/queue-3.9/s390-pci-implement-irq-functions-if-pci.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From c46b54f7406780ec4cf9c9124d1cfb777674dc70 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Mon, 10 Jun 2013 15:34:04 +0200
-Subject: s390/pci: Implement IRQ functions if !PCI
-
-From: Ben Hutchings <ben@decadent.org.uk>
-
-commit c46b54f7406780ec4cf9c9124d1cfb777674dc70 upstream.
-
-All architectures must implement IRQ functions.  Since various
-dependencies on !S390 were removed, there are various drivers that can
-be selected but will fail to link.  Provide a dummy implementation of
-these functions for the !PCI case.
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Acked-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/s390/kernel/irq.c |   64 +++++++++++++++++++++++++++++++++++++++++++++++++
- arch/s390/pci/pci.c    |   33 -------------------------
- 2 files changed, 64 insertions(+), 33 deletions(-)
-
---- a/arch/s390/kernel/irq.c
-+++ b/arch/s390/kernel/irq.c
-@@ -313,3 +313,67 @@ void measurement_alert_subclass_unregist
- 	spin_unlock(&ma_subclass_lock);
- }
- EXPORT_SYMBOL(measurement_alert_subclass_unregister);
-+
-+void synchronize_irq(unsigned int irq)
-+{
-+	/*
-+	 * Not needed, the handler is protected by a lock and IRQs that occur
-+	 * after the handler is deleted are just NOPs.
-+	 */
-+}
-+EXPORT_SYMBOL_GPL(synchronize_irq);
-+
-+#ifndef CONFIG_PCI
-+
-+/* Only PCI devices have dynamically-defined IRQ handlers */
-+
-+int request_irq(unsigned int irq, irq_handler_t handler,
-+		unsigned long irqflags, const char *devname, void *dev_id)
-+{
-+	return -EINVAL;
-+}
-+EXPORT_SYMBOL_GPL(request_irq);
-+
-+void free_irq(unsigned int irq, void *dev_id)
-+{
-+	WARN_ON(1);
-+}
-+EXPORT_SYMBOL_GPL(free_irq);
-+
-+void enable_irq(unsigned int irq)
-+{
-+	WARN_ON(1);
-+}
-+EXPORT_SYMBOL_GPL(enable_irq);
-+
-+void disable_irq(unsigned int irq)
-+{
-+	WARN_ON(1);
-+}
-+EXPORT_SYMBOL_GPL(disable_irq);
-+
-+#endif /* !CONFIG_PCI */
-+
-+void disable_irq_nosync(unsigned int irq)
-+{
-+	disable_irq(irq);
-+}
-+EXPORT_SYMBOL_GPL(disable_irq_nosync);
-+
-+unsigned long probe_irq_on(void)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(probe_irq_on);
-+
-+int probe_irq_off(unsigned long val)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(probe_irq_off);
-+
-+unsigned int probe_irq_mask(unsigned long val)
-+{
-+	return val;
-+}
-+EXPORT_SYMBOL_GPL(probe_irq_mask);
---- a/arch/s390/pci/pci.c
-+++ b/arch/s390/pci/pci.c
-@@ -306,15 +306,6 @@ static int zpci_cfg_store(struct zpci_de
- 	return rc;
- }
- 
--void synchronize_irq(unsigned int irq)
--{
--	/*
--	 * Not needed, the handler is protected by a lock and IRQs that occur
--	 * after the handler is deleted are just NOPs.
--	 */
--}
--EXPORT_SYMBOL_GPL(synchronize_irq);
--
- void enable_irq(unsigned int irq)
- {
- 	struct msi_desc *msi = irq_get_msi_desc(irq);
-@@ -331,30 +322,6 @@ void disable_irq(unsigned int irq)
- }
- EXPORT_SYMBOL_GPL(disable_irq);
- 
--void disable_irq_nosync(unsigned int irq)
--{
--	disable_irq(irq);
--}
--EXPORT_SYMBOL_GPL(disable_irq_nosync);
--
--unsigned long probe_irq_on(void)
--{
--	return 0;
--}
--EXPORT_SYMBOL_GPL(probe_irq_on);
--
--int probe_irq_off(unsigned long val)
--{
--	return 0;
--}
--EXPORT_SYMBOL_GPL(probe_irq_off);
--
--unsigned int probe_irq_mask(unsigned long val)
--{
--	return val;
--}
--EXPORT_SYMBOL_GPL(probe_irq_mask);
--
- void pcibios_fixup_bus(struct pci_bus *bus)
- {
- }
diff --git a/queue-3.9/series b/queue-3.9/series
index b8fb50d6247..6ed845962ca 100644
--- a/queue-3.9/series
+++ b/queue-3.9/series
@@ -10,7 +10,6 @@ drm-gma500-psb-unpin-framebuffer-on-crtc-disable.patch
 drm-gma500-cdv-unpin-framebuffer-on-crtc-disable.patch
 bluetooth-fix-missing-length-checks-for-l2cap-signalling-pdus.patch
 bluetooth-fix-mgmt-handling-of-power-on-failures.patch
-s390-pci-implement-irq-functions-if-pci.patch
 ath9k-disable-powersave-by-default.patch
 revert-ath9k_hw-update-rx-gain-initval-to-improve-rx-sensitivity.patch
 ath9k-use-minstrel-rate-control-by-default.patch