Floppy fix for sparc64
PATCH 1/1 Floppy fix for sparc64
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:
asm/floppy.h renamed from asm/floppy.h.orig +3 -3
@@ -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) {
Signature · 4 lines
Mathieu Chouquet-Stringer E-Mail : [email protected] Never attribute to malice that which can be adequately explained by stupidity. -- Hanlon's Razor --
PATCH: Fix floppy on sparc64 to new irq code
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.
include/asm/floppy.h renamed from include/asm-sparc64/floppy.h +2 -2
@@ -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) {
Signature · 4 lines
Mathieu Chouquet-Stringer E-Mail : [email protected] Never attribute to malice that which can be adequately explained by stupidity. -- Hanlon's Razor --
Re: PATCH: Fix floppy on sparc64 to new irq code
As Thierry Vignaud kindly pointed out, the patch only applies cleanly if your arch is sparc64. So here's a resend:
include/asm-sparc64/floppy.h +2 -2
@@ -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) {
Quoted 4 lines · Mathieu Chouquet-Stringer
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.con sparc64. It applies cleanly on top of 2.6.0-test1 or the current bk.
Signature · 4 lines
Mathieu Chouquet-Stringer E-Mail : [email protected] Never attribute to malice that which can be adequately explained by stupidity. -- Hanlon's Razor --
Re: PATCH: Fix floppy on sparc64 to new irq code
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.