f5e706ad88
With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.
The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^ 1' | cut -b 20-`
for FILE in ${FILES}; do
echo $FILE:
BASE=`echo $FILE | cut -d '.' -f 1`
FN32=${BASE}_32.h
FN64=${BASE}_64.h
GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
git mv asm-sparc/$FILE asm-sparc/$FN32
git mv asm-sparc64/$FILE asm-sparc/$FN64
echo git mv done
printf "#ifndef %s\n" $GUARD > asm-sparc/$FILE
printf "#define %s\n" $GUARD >> asm-sparc/$FILE
printf "#if defined(__sparc__) && defined(__arch64__)\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN64 >> asm-sparc/$FILE
printf "#else\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN32 >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
git add asm-sparc/$FILE
echo new file done
printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
git add asm-sparc64/$FILE
echo sparc64 file done
done
The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
112 lines
2.9 KiB
C
112 lines
2.9 KiB
C
/*
|
|
* bitops.h: Bit string operations on the Sparc.
|
|
*
|
|
* Copyright 1995 David S. Miller (davem@caip.rutgers.edu)
|
|
* Copyright 1996 Eddie C. Dost (ecd@skynet.be)
|
|
* Copyright 2001 Anton Blanchard (anton@samba.org)
|
|
*/
|
|
|
|
#ifndef _SPARC_BITOPS_H
|
|
#define _SPARC_BITOPS_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <asm/byteorder.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#ifndef _LINUX_BITOPS_H
|
|
#error only <linux/bitops.h> can be included directly
|
|
#endif
|
|
|
|
extern unsigned long ___set_bit(unsigned long *addr, unsigned long mask);
|
|
extern unsigned long ___clear_bit(unsigned long *addr, unsigned long mask);
|
|
extern unsigned long ___change_bit(unsigned long *addr, unsigned long mask);
|
|
|
|
/*
|
|
* Set bit 'nr' in 32-bit quantity at address 'addr' where bit '0'
|
|
* is in the highest of the four bytes and bit '31' is the high bit
|
|
* within the first byte. Sparc is BIG-Endian. Unless noted otherwise
|
|
* all bit-ops return 0 if bit was previously clear and != 0 otherwise.
|
|
*/
|
|
static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
return ___set_bit(ADDR, mask) != 0;
|
|
}
|
|
|
|
static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
(void) ___set_bit(ADDR, mask);
|
|
}
|
|
|
|
static inline int test_and_clear_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
return ___clear_bit(ADDR, mask) != 0;
|
|
}
|
|
|
|
static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
(void) ___clear_bit(ADDR, mask);
|
|
}
|
|
|
|
static inline int test_and_change_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
return ___change_bit(ADDR, mask) != 0;
|
|
}
|
|
|
|
static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
|
|
{
|
|
unsigned long *ADDR, mask;
|
|
|
|
ADDR = ((unsigned long *) addr) + (nr >> 5);
|
|
mask = 1 << (nr & 31);
|
|
|
|
(void) ___change_bit(ADDR, mask);
|
|
}
|
|
|
|
#include <asm-generic/bitops/non-atomic.h>
|
|
|
|
#define smp_mb__before_clear_bit() do { } while(0)
|
|
#define smp_mb__after_clear_bit() do { } while(0)
|
|
|
|
#include <asm-generic/bitops/ffz.h>
|
|
#include <asm-generic/bitops/__ffs.h>
|
|
#include <asm-generic/bitops/sched.h>
|
|
#include <asm-generic/bitops/ffs.h>
|
|
#include <asm-generic/bitops/fls.h>
|
|
#include <asm-generic/bitops/fls64.h>
|
|
#include <asm-generic/bitops/hweight.h>
|
|
#include <asm-generic/bitops/lock.h>
|
|
#include <asm-generic/bitops/find.h>
|
|
#include <asm-generic/bitops/ext2-non-atomic.h>
|
|
#include <asm-generic/bitops/ext2-atomic.h>
|
|
#include <asm-generic/bitops/minix.h>
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* defined(_SPARC_BITOPS_H) */
|