Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S269090AbUISLPU (ORCPT ); Sun, 19 Sep 2004 07:15:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S269215AbUISLPU (ORCPT ); Sun, 19 Sep 2004 07:15:20 -0400 Received: from mxfep01.bredband.com ([195.54.107.70]:5821 "EHLO mxfep01.bredband.com") by vger.kernel.org with ESMTP id S269090AbUISLPI (ORCPT ); Sun, 19 Sep 2004 07:15:08 -0400 Subject: Re: [PATCH 0/3] lockmeter: fixes From: Alexander Nyberg To: Ray Bryant Cc: Ray Bryant , Andrew Morton , lse-tech@lists.sourceforge.net, "Martin J. Bligh" , Zwane Mwaikambo , linux-kernel@vger.kernel.org In-Reply-To: <20040916230344.23023.79384.49263@tomahawk.engr.sgi.com> References: <20040916230344.23023.79384.49263@tomahawk.engr.sgi.com> Content-Type: text/plain Message-Id: <1095592506.619.8.camel@boxen> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.6 Date: Sun, 19 Sep 2004 13:15:06 +0200 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2402 Lines: 75 > Andrew, > > The first patch in this series is a replacement patch for the prempt-fix > patch I sent earlier this morning. There was a missing paren in that > previous version. > > Adding this to 2.6.9-rc2-mm1 (just after lockmeter-2.patch) fixes the > preempt compile problem on ia64, at least. However, I then started > getting a missing symbol for generic_raw_read_trylock. Hence the second > patch of this series. Hi Ray I need the following to compile on x86-64, works fine otherwise. --- mm/kernel/lockmeter.c.orig 2004-09-19 12:49:52.000000000 +0200 +++ mm/kernel/lockmeter.c 2004-09-19 12:50:25.000000000 +0200 @@ -1510,3 +1510,13 @@ int __lockfunc _spin_trylock_bh(spinlock return 0; } EXPORT_SYMBOL(_spin_trylock_bh); + +int in_lock_functions(unsigned long addr) +{ + /* Linker adds these: start and end of __lockfunc functions */ + extern char __lock_text_start[], __lock_text_end[]; + + return addr >= (unsigned long)__lock_text_start + && addr < (unsigned long)__lock_text_end; +} +EXPORT_SYMBOL(in_lock_functions); --- mm/include/asm-x86_64/spinlock.h.orig 2004-09-19 12:31:32.000000000 +0200 +++ mm/include/asm-x86_64/spinlock.h 2004-09-19 13:04:56.117109248 +0200 @@ -232,16 +232,6 @@ static inline void _raw_write_lock(rwloc #define _raw_read_unlock(rw) asm volatile("lock ; incl %0" :"=m" ((rw)->lock) : : "memory") #define _raw_write_unlock(rw) asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ",%0":"=m" ((rw)->lock) : : "memory") -static inline int _raw_read_trylock(rwlock_t *lock) -{ - atomic_t *count = (atomic_t *)lock; - atomic_dec(count); - if (atomic_read(count) < RW_LOCK_BIAS) - return 1; - atomic_inc(count); - return 0; -} - static inline int _raw_write_trylock(rwlock_t *lock) { atomic_t *count = (atomic_t *)lock; @@ -262,6 +252,16 @@ static inline int _raw_read_trylock(rwlo atomic_inc(count); return 0; } +#else +static inline int _raw_read_trylock(rwlock_t *lock) +{ + atomic_t *count = (atomic_t *)lock; + atomic_dec(count); + if (atomic_read(count) < RW_LOCK_BIAS) + return 1; + atomic_inc(count); + return 0; +} #endif #if defined(CONFIG_LOCKMETER) && defined(CONFIG_HAVE_DEC_LOCK) - 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/