public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Chouquet-Stringer <mchouque@online.fr>
To: davem@redhat.com, linux-kernel@vger.kernel.org, torvalds@osdl.org
Subject: PATCH: Fix floppy on sparc64 to new irq code
Date: Fri, 18 Jul 2003 17:27:50 -0400	[thread overview]
Message-ID: <20030718212750.GA19649@shookay.newview.com> (raw)
In-Reply-To: <20030717161530.GA15057@shookay.newview.com>

I haven't heard anything so here's the patch again (and the other one had a
superfluous ampersand anyway). Without it you can't compile
drivers/block/floppy.c on sparc64. It applies cleanly on top of 2.6.0-test1
or the current bk.

--- linux-2.6.0-test1/include/asm-sparc64/floppy.h	2003-07-13 23:39:23.000000000 -0400
+++ linux-2.6.0-test1-mathieu/include/asm/floppy.h	2003-07-18 17:18:43.000000000 -0400
@@ -214,7 +214,7 @@
 }
 
 /* Our low-level entry point in arch/sparc/kernel/entry.S */
-extern void floppy_hardint(int irq, void *unused, struct pt_regs *regs);
+extern irqreturn_t floppy_hardint(int irq, void *unused, struct pt_regs *regs);
 
 static int sun_fd_request_irq(void)
 {
@@ -277,7 +277,7 @@
 static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
 static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
 
-extern void floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+extern irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 static unsigned char sun_pci_fd_inb(unsigned long port)
 {

-- 
Mathieu Chouquet-Stringer              E-Mail : mchouque@online.fr
       Never attribute to malice that which can be adequately
                    explained by stupidity.
                     -- Hanlon's Razor --

  reply	other threads:[~2003-07-18 21:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-07-17 16:15 [PATCH] Floppy fix for sparc64 Mathieu Chouquet-Stringer
2003-07-18 21:27 ` Mathieu Chouquet-Stringer [this message]
2003-07-18 22:43   ` PATCH: Fix floppy on sparc64 to new irq code Mathieu Chouquet-Stringer
2003-07-19  0:09     ` David S. Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030718212750.GA19649@shookay.newview.com \
    --to=mchouque@online.fr \
    --cc=davem@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox