From e33298684417c2a6b5e8e30be38cc56e4c070467 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 25 Oct 2007 14:21:49 -0700 Subject: [PATCH] --- yaml --- r: 72590 b: refs/heads/master c: fb9431eb038caa027cb98cb18576f1a731e56f76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/bitops_32.h | 7 +++++-- trunk/include/asm-x86/bitops_64.h | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 87a2d3d707ac..0e7d8ee4c730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a60387ba3114fe087349df23fa82e5ad9d5b6ff2 +refs/heads/master: fb9431eb038caa027cb98cb18576f1a731e56f76 diff --git a/trunk/include/asm-x86/bitops_32.h b/trunk/include/asm-x86/bitops_32.h index 36ebb5b02b4f..0b40f6d20bea 100644 --- a/trunk/include/asm-x86/bitops_32.h +++ b/trunk/include/asm-x86/bitops_32.h @@ -183,9 +183,12 @@ static inline int test_and_set_bit(int nr, volatile unsigned long * addr) * @nr: Bit to set * @addr: Address to count from * - * This is the same as test_and_set_bit on x86 + * This is the same as test_and_set_bit on x86. */ -#define test_and_set_bit_lock test_and_set_bit +static inline int test_and_set_bit_lock(int nr, volatile unsigned long *addr) +{ + return test_and_set_bit(nr, addr); +} /** * __test_and_set_bit - Set a bit and return its old value diff --git a/trunk/include/asm-x86/bitops_64.h b/trunk/include/asm-x86/bitops_64.h index b4d47940b959..bba26e03f33f 100644 --- a/trunk/include/asm-x86/bitops_64.h +++ b/trunk/include/asm-x86/bitops_64.h @@ -173,9 +173,12 @@ static __inline__ int test_and_set_bit(int nr, volatile void * addr) * @nr: Bit to set * @addr: Address to count from * - * This is the same as test_and_set_bit on x86 + * This is the same as test_and_set_bit on x86. */ -#define test_and_set_bit_lock test_and_set_bit +static __inline__ int test_and_set_bit_lock(int nr, volatile void *addr) +{ + return test_and_set_bit(nr, addr); +} /** * __test_and_set_bit - Set a bit and return its old value