[PATCH] M68k IDE lock fixes

From: Geert Uytterhoeven (geert@linux-m68k.org)
Date: Wed Oct 30 2002 - 11:52:39 EST

M68k IDE lock fixes:
  - Kill warning: ide_{get,release}_lock() can be real routines only if
    IDE_ARCH_LOCK is defined, the same is true for ide_intr_lock
  - Use the correct lock for ide_{get,release}_lock()

--- linux-2.5.x-bk-20021030/drivers/ide/ide.c Wed Sep 18 10:36:42 2002
+++ linux-m68k-2.5.x/drivers/ide/ide.c Wed Sep 18 10:48:17 2002
@@ -181,13 +181,13 @@
 
 static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */
 
-#if defined(__mc68000__) || defined(CONFIG_APUS)
+#ifdef IDE_ARCH_LOCK
 /*
  * ide_lock is used by the Atari code to obtain access to the IDE interrupt,
  * which is shared between several drivers.
  */
 static int ide_intr_lock;
-#endif /* __mc68000__ || CONFIG_APUS */
+#endif /* IDE_ARCH_LOCK */
 
 #ifdef CONFIG_IDEDMA_AUTO
 int noautodma = 0;
@@ -1097,7 +1097,7 @@
                                  */
 
                                 /* for atari only */
- ide_release_lock(&ide_lock);
+ ide_release_lock(&ide_intr_lock);
                                 hwgroup->busy = 0;
                         }
 

Gr{oetje,eeting}s,

                                                Geert 

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
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/

This archive was generated by hypermail 2b29 : Thu Oct 31 2002 - 22:00:47 EST