aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/bitops_mm.h8
-rw-r--r--arch/m68k/include/asm/bitops_no.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h
index b4ecdaada520..31a16d47d205 100644
--- a/arch/m68k/include/asm/bitops_mm.h
+++ b/arch/m68k/include/asm/bitops_mm.h
@@ -366,9 +366,9 @@ static inline int minix_test_bit(int nr, const void *vaddr)
366#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr)) 366#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
367#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr)) 367#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
368#define ext2_find_next_zero_bit(addr, size, offset) \ 368#define ext2_find_next_zero_bit(addr, size, offset) \
369 generic_find_next_zero_le_bit((unsigned long *)addr, size, offset) 369 find_next_zero_bit_le((unsigned long *)addr, size, offset)
370#define ext2_find_next_bit(addr, size, offset) \ 370#define ext2_find_next_bit(addr, size, offset) \
371 generic_find_next_le_bit((unsigned long *)addr, size, offset) 371 find_next_bit_le((unsigned long *)addr, size, offset)
372 372
373static inline int ext2_test_bit(int nr, const void *vaddr) 373static inline int ext2_test_bit(int nr, const void *vaddr)
374{ 374{
@@ -398,7 +398,7 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
398 return (p - addr) * 32 + res; 398 return (p - addr) * 32 + res;
399} 399}
400 400
401static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr, 401static inline unsigned long find_next_zero_bit_le(const unsigned long *addr,
402 unsigned long size, unsigned long offset) 402 unsigned long size, unsigned long offset)
403{ 403{
404 const unsigned long *p = addr + (offset >> 5); 404 const unsigned long *p = addr + (offset >> 5);
@@ -440,7 +440,7 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
440 return (p - addr) * 32 + res; 440 return (p - addr) * 32 + res;
441} 441}
442 442
443static inline unsigned long generic_find_next_le_bit(const unsigned long *addr, 443static inline unsigned long find_next_bit_le(const unsigned long *addr,
444 unsigned long size, unsigned long offset) 444 unsigned long size, unsigned long offset)
445{ 445{
446 const unsigned long *p = addr + (offset >> 5); 446 const unsigned long *p = addr + (offset >> 5);
diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h
index 9d3cbe5fad1e..58c67aaf91e2 100644
--- a/arch/m68k/include/asm/bitops_no.h
+++ b/arch/m68k/include/asm/bitops_no.h
@@ -325,7 +325,7 @@ found_middle:
325} 325}
326 326
327#define ext2_find_next_bit(addr, size, off) \ 327#define ext2_find_next_bit(addr, size, off) \
328 generic_find_next_le_bit((unsigned long *)(addr), (size), (off)) 328 find_next_bit_le((unsigned long *)(addr), (size), (off))
329#include <asm-generic/bitops/minix.h> 329#include <asm-generic/bitops/minix.h>
330 330
331#endif /* __KERNEL__ */ 331#endif /* __KERNEL__ */