From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?Uwe=20Kleine-K=C3=B6nig?= Subject: [PATCH 6/6] [ARM] Use atomic_spin_lock/atomic_spin_unlock for irqdesc lock Date: Fri, 7 Aug 2009 22:42:41 +0200 Message-ID: <1249677761-19470-6-git-send-email-u.kleine-koenig@pengutronix.de> References: <20090807203939.GA19374@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: LKML , rt-users To: Thomas Gleixner Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:33076 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933808AbZHGUmw (ORCPT ); Fri, 7 Aug 2009 16:42:52 -0400 In-Reply-To: <20090807203939.GA19374@pengutronix.de> Sender: linux-rt-users-owner@vger.kernel.org List-ID: This was missed in commit fd2bde5 (genirq: Convert irqdesc lock to atomic_spinlock) Signed-off-by: Uwe Kleine-K=C3=B6nig --- 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/mac= h/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) =20 #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 =3D (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; --=20 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-user= s" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html