[PATCH] Floppy fix for sparc64

Mathieu Chouquet-Stringer
2003-07-17T16:00:43Z

Hi all,

I add to fix the declarations of 2 fonctions in asm-sparc64/floppy.h to
get drivers/block/floppy.c to compile. I haven't seen this patch on lkml so
here it is:

--- include/asm/floppy.h.orig 2003-07-17 11:36:09.000000000 -0400
+++ include/asm/floppy.h 2003-07-17 12:10:17.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)
{
@@ -224,7 +224,7 @@
if(!once) {
once = 1;

- error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
+ error = request_fast_irq(FLOPPY_IRQ, &floppy_hardint,
SA_INTERRUPT, "floppy", NULL);

return ((error == 0) ? 0 : -1);
@@ -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 : mathieu@newview.com