61f2e7b0f4
minix bit operations are only used by minix filesystem and useless by other modules. Because byte order of inode and block bitmaps is different on each architecture like below: m68k: big-endian 16bit indexed bitmaps h8300, microblaze, s390, sparc, m68knommu: big-endian 32 or 64bit indexed bitmaps m32r, mips, sh, xtensa: big-endian 32 or 64bit indexed bitmaps for big-endian mode little-endian bitmaps for little-endian mode Others: little-endian bitmaps In order to move minix bit operations from asm/bitops.h to architecture independent code in minix filesystem, this provides two config options. CONFIG_MINIX_FS_BIG_ENDIAN_16BIT_INDEXED is only selected by m68k. CONFIG_MINIX_FS_NATIVE_ENDIAN is selected by the architectures which use native byte order bitmaps (h8300, microblaze, s390, sparc, m68knommu, m32r, mips, sh, xtensa). The architectures which always use little-endian bitmaps do not select these options. Finally, we can remove minix bit operations from asm/bitops.h for all architectures. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Greg Ungerer <gerg@uclinux.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Andreas Schwab <schwab@linux-m68k.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Michal Simek <monstr@monstr.eu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Hirokazu Takata <takata@linux-m32r.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
102 lines
2.4 KiB
C
102 lines
2.4 KiB
C
/*
|
|
* bitops.h: Bit string operations on the V9.
|
|
*
|
|
* Copyright 1996, 1997 David S. Miller (davem@caip.rutgers.edu)
|
|
*/
|
|
|
|
#ifndef _SPARC64_BITOPS_H
|
|
#define _SPARC64_BITOPS_H
|
|
|
|
#ifndef _LINUX_BITOPS_H
|
|
#error only <linux/bitops.h> can be included directly
|
|
#endif
|
|
|
|
#include <linux/compiler.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
extern int test_and_set_bit(unsigned long nr, volatile unsigned long *addr);
|
|
extern int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);
|
|
extern int test_and_change_bit(unsigned long nr, volatile unsigned long *addr);
|
|
extern void set_bit(unsigned long nr, volatile unsigned long *addr);
|
|
extern void clear_bit(unsigned long nr, volatile unsigned long *addr);
|
|
extern void change_bit(unsigned long nr, volatile unsigned long *addr);
|
|
|
|
#include <asm-generic/bitops/non-atomic.h>
|
|
|
|
#define smp_mb__before_clear_bit() barrier()
|
|
#define smp_mb__after_clear_bit() barrier()
|
|
|
|
#include <asm-generic/bitops/ffz.h>
|
|
#include <asm-generic/bitops/__ffs.h>
|
|
#include <asm-generic/bitops/fls.h>
|
|
#include <asm-generic/bitops/__fls.h>
|
|
#include <asm-generic/bitops/fls64.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm-generic/bitops/sched.h>
|
|
#include <asm-generic/bitops/ffs.h>
|
|
|
|
/*
|
|
* hweightN: returns the hamming weight (i.e. the number
|
|
* of bits set) of a N-bit word
|
|
*/
|
|
|
|
#ifdef ULTRA_HAS_POPULATION_COUNT
|
|
|
|
static inline unsigned int __arch_hweight64(unsigned long w)
|
|
{
|
|
unsigned int res;
|
|
|
|
__asm__ ("popc %1,%0" : "=r" (res) : "r" (w));
|
|
return res;
|
|
}
|
|
|
|
static inline unsigned int __arch_hweight32(unsigned int w)
|
|
{
|
|
unsigned int res;
|
|
|
|
__asm__ ("popc %1,%0" : "=r" (res) : "r" (w & 0xffffffff));
|
|
return res;
|
|
}
|
|
|
|
static inline unsigned int __arch_hweight16(unsigned int w)
|
|
{
|
|
unsigned int res;
|
|
|
|
__asm__ ("popc %1,%0" : "=r" (res) : "r" (w & 0xffff));
|
|
return res;
|
|
}
|
|
|
|
static inline unsigned int __arch_hweight8(unsigned int w)
|
|
{
|
|
unsigned int res;
|
|
|
|
__asm__ ("popc %1,%0" : "=r" (res) : "r" (w & 0xff));
|
|
return res;
|
|
}
|
|
|
|
#else
|
|
|
|
#include <asm-generic/bitops/arch_hweight.h>
|
|
|
|
#endif
|
|
#include <asm-generic/bitops/const_hweight.h>
|
|
#include <asm-generic/bitops/lock.h>
|
|
#endif /* __KERNEL__ */
|
|
|
|
#include <asm-generic/bitops/find.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <asm-generic/bitops/le.h>
|
|
|
|
#define ext2_set_bit_atomic(lock,nr,addr) \
|
|
test_and_set_bit((nr) ^ 0x38,(unsigned long *)(addr))
|
|
#define ext2_clear_bit_atomic(lock,nr,addr) \
|
|
test_and_clear_bit((nr) ^ 0x38,(unsigned long *)(addr))
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* defined(_SPARC64_BITOPS_H) */
|