From 1fcb7623bc138d780101d7a70cfe29b11f7c67ef Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 8 Jul 2000 02:59:00 +0000 Subject: Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not -Werror clean. --- include/asm-alpha/bitops.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/asm-alpha/bitops.h') diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 0d7a881a7..4cdfb21d5 100644 --- a/include/asm-alpha/bitops.h +++ b/include/asm-alpha/bitops.h @@ -290,8 +290,9 @@ found_middle: #define ext2_find_next_zero_bit find_next_zero_bit /* Bitmap functions for the minix filesystem. */ -#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr) -#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr) +#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr) +#define minix_set_bit(nr,addr) set_bit(nr,addr) +#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr) #define minix_test_bit(nr,addr) test_bit(nr,addr) #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) -- cgit v1.2.3