From: Chris Wright Date: Tue, 6 Sep 2005 23:24:50 +0000 (-0700) Subject: Sparc request_irq fix for RTC from DaveM. X-Git-Tag: v2.6.13.1~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=031951a36968200fcf3a82e402c9d710f4144686;p=thirdparty%2Fkernel%2Fstable-queue.git Sparc request_irq fix for RTC from DaveM. --- diff --git a/queue/series b/queue/series index 902b496780f..d45ba735665 100644 --- a/queue/series +++ b/queue/series @@ -5,3 +5,4 @@ fix-pci-rom-mapping.patch pci_assign_unassigned_resources-update.patch fix-socket-filter-regression.patch ipsec-oops-fix.patch +sparc-request_irq-in-RTC-fix.patch diff --git a/queue/sparc-request_irq-in-RTC-fix.patch b/queue/sparc-request_irq-in-RTC-fix.patch new file mode 100644 index 00000000000..4003a208757 --- /dev/null +++ b/queue/sparc-request_irq-in-RTC-fix.patch @@ -0,0 +1,31 @@ +From stable-bounces@linux.kernel.org Tue Sep 6 15:03:44 2005 +Date: Tue, 06 Sep 2005 15:03:39 -0700 (PDT) +To: stable@kernel.org +From: "David S. Miller" +Subject: [RTC]: Use SA_SHIRQ in sparc specific code. + +Based upon a report from Jason Wever. + +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +--- + drivers/char/rtc.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +Index: linux-2.6.13.y/drivers/char/rtc.c +=================================================================== +--- linux-2.6.13.y.orig/drivers/char/rtc.c ++++ linux-2.6.13.y/drivers/char/rtc.c +@@ -938,10 +938,9 @@ found: + + /* + * XXX Interrupt pin #7 in Espresso is shared between RTC and +- * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here +- * is asking for trouble with add-on boards. Change to SA_SHIRQ. ++ * PCI Slot 2 INTA# (and some INTx# in Slot 1). + */ +- if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) { ++ if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) { + /* + * Standard way for sparc to print irq's is to use + * __irq_itoa(). I think for EBus it's ok to use %d.