Commit 0cfcb1f1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k IDE lock fixes

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()
parent bc3d1389
...@@ -181,13 +181,13 @@ spinlock_t ide_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED; ...@@ -181,13 +181,13 @@ spinlock_t ide_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */ 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, * ide_lock is used by the Atari code to obtain access to the IDE interrupt,
* which is shared between several drivers. * which is shared between several drivers.
*/ */
static int ide_intr_lock; static int ide_intr_lock;
#endif /* __mc68000__ || CONFIG_APUS */ #endif /* IDE_ARCH_LOCK */
#ifdef CONFIG_IDEDMA_AUTO #ifdef CONFIG_IDEDMA_AUTO
int noautodma = 0; int noautodma = 0;
...@@ -1092,7 +1092,7 @@ void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) ...@@ -1092,7 +1092,7 @@ void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq)
*/ */
/* for atari only */ /* for atari only */
ide_release_lock(&ide_lock); ide_release_lock(&ide_intr_lock);
hwgroup->busy = 0; hwgroup->busy = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment