lkml.org 
[lkml]   [2003]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH][2.5.71] x86-64 floppy.h missing irqreturn_t conversion
Andi,

In the 2.5.71 x86-64 kernel, floppy.h is incompletely converted
for the recent irqreturn_t changes. This doesn't show up as a
compile-time warning. The error is that floppy_hardint() always
returns IRQ_HANDLED in the !doing_pdma case, instead of returning
whatever floppy_interrupt() returned, which can be IRQ_NONE.

This patch is basically just a merge with asm-i386/floppy.h.

/Mikael

diff -ruN linux-2.5.71-andi/include/asm-x86_64/floppy.h linux-2.5.71-mikpe/include/asm-x86_64/floppy.h
--- linux-2.5.71-andi/include/asm-x86_64/floppy.h 2003-05-28 22:16:03.000000000 +0200
+++ linux-2.5.71-mikpe/include/asm-x86_64/floppy.h 2003-06-16 16:09:26.000000000 +0200
@@ -22,7 +22,7 @@
* floppy accesses go through the track buffer.
*/
#define _CROSS_64KB(a,s,vdma) \
-(!vdma && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))
+(!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64))

#define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1)

@@ -62,10 +62,8 @@
static int bytes=0;
static int dma_wait=0;
#endif
- if(!doing_pdma) {
- floppy_interrupt(irq, dev_id, regs);
- return IRQ_HANDLED;
- }
+ if (!doing_pdma)
+ return floppy_interrupt(irq, dev_id, regs);

#ifdef TRACE_FLPY_INT
if(!calls)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:36    [from the cache]
©2003-2011 Jasper Spaans