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 : [email protected]
Never attribute to malice that which can be adequately
explained by stupidity.
-- Hanlon's Razor --
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 : [email protected]
Never attribute to malice that which can be adequately
explained by stupidity.
-- Hanlon's Razor --
As Thierry Vignaud kindly pointed out, the patch only applies cleanly if
your arch is sparc64. So here's a resend:
--- 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-sparc64/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)
{
On Fri, Jul 18, 2003 at 05:27:50PM -0400, Mathieu Chouquet-Stringer wrote:
> 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.
--
Mathieu Chouquet-Stringer E-Mail : [email protected]
Never attribute to malice that which can be adequately
explained by stupidity.
-- Hanlon's Razor --
I applied your patch.
I'm just ignoring you otherwise because you didn't post
this to the correct list, Sparc hackers don't hang out
on linux-kernel therefore nearly all of them didn't see
your patch.
Post to [email protected] next time, thanks.