lkml.org 
[lkml]   [2009]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/6] [ARM] Use atomic_spin_lock/atomic_spin_unlock for irqdesc lock
    Date
    This was missed in commit

    fd2bde5 (genirq: Convert irqdesc lock to atomic_spinlock)

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    arch/arm/include/asm/mach/irq.h | 4 ++--
    mm/highmem.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h
    index acac530..3981cf2 100644
    --- a/arch/arm/include/asm/mach/irq.h
    +++ b/arch/arm/include/asm/mach/irq.h
    @@ -26,9 +26,9 @@ extern int show_fiq_list(struct seq_file *, void *);
    */
    #define do_bad_IRQ(irq,desc) \
    do { \
    - spin_lock(&desc->lock); \
    + atomic_spin_lock(&desc->lock); \
    handle_bad_irq(irq, desc); \
    - spin_unlock(&desc->lock); \
    + atomic_spin_unlock(&desc->lock); \
    } while(0)

    #endif
    diff --git a/mm/highmem.c b/mm/highmem.c
    index 66e915a..214eefd 100644
    --- a/mm/highmem.c
    +++ b/mm/highmem.c
    @@ -372,8 +372,8 @@ void *kmap_high_get(struct page *page)
    lock_kmap_any(flags);
    vaddr = (unsigned long)page_address(page);
    if (vaddr) {
    - BUG_ON(pkmap_count[PKMAP_NR(vaddr)] < 1);
    - pkmap_count[PKMAP_NR(vaddr)]++;
    + BUG_ON(atomic_read(&pkmap_count[PKMAP_NR(vaddr)]) < 1);
    + atomic_add(1, pkmap_count[PKMAP_NR(vaddr)]);
    }
    unlock_kmap_any(flags);
    return (void*) vaddr;
    --
    1.6.3.3
    --
    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: 2009-08-07 22:45    [W:0.028 / U:34.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site