/* Much care has gone into this code, do not touch it.
*
-diff -urN linux-2.4.24.org/include/asm-sparc64/bitops.h linux-2.4.24/include/asm-sparc64/bitops.h
---- linux-2.4.24.org/include/asm-sparc64/bitops.h 2004-02-04 20:48:02.155595906 +0100
-+++ linux-2.4.24/include/asm-sparc64/bitops.h 2004-02-04 20:52:54.137864420 +0100
-@@ -1,4 +1,4 @@
--/* $Id$
-+/* $Id$
- * bitops.h: Bit string operations on the V9.
- *
- * Copyright 1996, 1997 David S. Miller (davem@caip.rutgers.edu)
-@@ -7,11 +7,12 @@
- #ifndef _SPARC64_BITOPS_H
- #define _SPARC64_BITOPS_H
-
-+#include <linux/compiler.h>
- #include <asm/byteorder.h>
-
--extern long ___test_and_set_bit(unsigned long nr, volatile void *addr);
--extern long ___test_and_clear_bit(unsigned long nr, volatile void *addr);
--extern long ___test_and_change_bit(unsigned long nr, volatile void *addr);
-+extern long ___test_and_set_bit(unsigned long nr, volatile unsigned long *addr);
-+extern long ___test_and_clear_bit(unsigned long nr, volatile unsigned long *addr);
-+extern long ___test_and_change_bit(unsigned long nr, volatile unsigned long *addr);
-
- #define test_and_set_bit(nr,addr) ({___test_and_set_bit(nr,addr)!=0;})
- #define test_and_clear_bit(nr,addr) ({___test_and_clear_bit(nr,addr)!=0;})
-@@ -21,109 +22,132 @@
- #define change_bit(nr,addr) ((void)___test_and_change_bit(nr,addr))
-
- /* "non-atomic" versions... */
--#define __set_bit(X,Y) \
--do { unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- *__m |= (1UL << (__nr & 63)); \
--} while (0)
--#define __clear_bit(X,Y) \
--do { unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- *__m &= ~(1UL << (__nr & 63)); \
--} while (0)
--#define __change_bit(X,Y) \
--do { unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- *__m ^= (1UL << (__nr & 63)); \
--} while (0)
--#define __test_and_set_bit(X,Y) \
--({ unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- long __old = *__m; \
-- long __mask = (1UL << (__nr & 63)); \
-- *__m = (__old | __mask); \
-- ((__old & __mask) != 0); \
--})
--#define __test_and_clear_bit(X,Y) \
--({ unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- long __old = *__m; \
-- long __mask = (1UL << (__nr & 63)); \
-- *__m = (__old & ~__mask); \
-- ((__old & __mask) != 0); \
--})
--#define __test_and_change_bit(X,Y) \
--({ unsigned long __nr = (X); \
-- long *__m = ((long *) (Y)) + (__nr >> 6); \
-- long __old = *__m; \
-- long __mask = (1UL << (__nr & 63)); \
-- *__m = (__old ^ __mask); \
-- ((__old & __mask) != 0); \
--})
-+
-+static __inline__ void __set_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+
-+ *m |= (1UL << (nr & 63));
-+}
-+
-+static __inline__ void __clear_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+
-+ *m &= ~(1UL << (nr & 63));
-+}
-+
-+static __inline__ void __change_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+
-+ *m ^= (1UL << (nr & 63));
-+}
-+
-+static __inline__ int __test_and_set_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+ long old = *m;
-+ long mask = (1UL << (nr & 63));
-+
-+ *m = (old | mask);
-+ return ((old & mask) != 0);
-+}
-+
-+static __inline__ int __test_and_clear_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+ long old = *m;
-+ long mask = (1UL << (nr & 63));
-+
-+ *m = (old & ~mask);
-+ return ((old & mask) != 0);
-+}
-+
-+static __inline__ int __test_and_change_bit(int nr, volatile unsigned long *addr)
-+{
-+ volatile unsigned long *m = addr + (nr >> 6);
-+ long old = *m;
-+ long mask = (1UL << (nr & 63));
-+
-+ *m = (old ^ mask);
-+ return ((old & mask) != 0);
-+}
-
- #define smp_mb__before_clear_bit() do { } while(0)
- #define smp_mb__after_clear_bit() do { } while(0)
-
--extern __inline__ int test_bit(int nr, __const__ void *addr)
-+static __inline__ int test_bit(int nr, __const__ volatile unsigned long *addr)
- {
-- return (1UL & (((__const__ long *) addr)[nr >> 6] >> (nr & 63))) != 0UL;
-+ return (1UL & ((addr)[nr >> 6] >> (nr & 63))) != 0UL;
- }
-
- /* The easy/cheese version for now. */
--extern __inline__ unsigned long ffz(unsigned long word)
-+static __inline__ unsigned long ffz(unsigned long word)
- {
- unsigned long result;
-
--#ifdef ULTRA_HAS_POPULATION_COUNT /* Thanks for nothing Sun... */
-- __asm__ __volatile__(
--" brz,pn %0, 1f\n"
--" neg %0, %%g1\n"
--" xnor %0, %%g1, %%g2\n"
--" popc %%g2, %0\n"
--"1: " : "=&r" (result)
-- : "0" (word)
-- : "g1", "g2");
--#else
--#if 1 /* def EASY_CHEESE_VERSION */
- result = 0;
- while(word & 1) {
- result++;
- word >>= 1;
- }
--#else
-- unsigned long tmp;
-+ return result;
-+}
-
-- result = 0;
-- tmp = ~word & -~word;
-- if (!(unsigned)tmp) {
-- tmp >>= 32;
-- result = 32;
-- }
-- if (!(unsigned short)tmp) {
-- tmp >>= 16;
-- result += 16;
-- }
-- if (!(unsigned char)tmp) {
-- tmp >>= 8;
-- result += 8;
-+/**
-+ * __ffs - find first bit in word.
-+ * @word: The word to search
-+ *
-+ * Undefined if no bit exists, so code should check against 0 first.
-+ */
-+static __inline__ unsigned long __ffs(unsigned long word)
-+{
-+ unsigned long result = 0;
-+
-+ while (!(word & 1UL)) {
-+ result++;
-+ word >>= 1;
- }
-- if (tmp & 0xf0) result += 4;
-- if (tmp & 0xcc) result += 2;
-- if (tmp & 0xaa) result ++;
--#endif
--#endif
- return result;
- }
-
-+/*
-+ * fls: find last bit set.
-+ */
-+
-+#define fls(x) generic_fls(x)
-+
+--- linux-2.4.30/include/asm-sparc64/bitops.h.orig 2005-04-04 03:42:20.000000000 +0200
++++ linux-2.4.30/include/asm-sparc64/bitops.h 2005-04-05 12:20:56.000000000 +0200
+@@ -130,6 +130,23 @@
#ifdef __KERNEL__
/*
* ffs: find first bit set. This is defined the same way as
* the libc and compiler builtin ffs routines, therefore
* differs in spirit from the above ffz (man ffs).
- */
--
--#define ffs(x) generic_ffs(x)
-+static __inline__ int ffs(int x)
-+{
-+ if (!x)
-+ return 0;
-+ return __ffs((unsigned long)x);
-+}
-
- /*
- * hweightN: returns the hamming weight (i.e. the number
-@@ -132,7 +156,7 @@
-
- #ifdef ULTRA_HAS_POPULATION_COUNT
-
--extern __inline__ unsigned int hweight32(unsigned int w)
-+static __inline__ unsigned int hweight32(unsigned int w)
- {
- unsigned int res;
-
-@@ -140,7 +164,7 @@
- return res;
- }
-
--extern __inline__ unsigned int hweight16(unsigned int w)
-+static __inline__ unsigned int hweight16(unsigned int w)
- {
- unsigned int res;
-
-@@ -148,7 +172,7 @@
- return res;
- }
-
--extern __inline__ unsigned int hweight8(unsigned int w)
-+static __inline__ unsigned int hweight8(unsigned int w)
- {
- unsigned int res;
-
-@@ -165,14 +189,69 @@
+@@ -190,14 +207,69 @@
#endif
#endif /* __KERNEL__ */
* on Linus's ALPHA routines, which are pretty portable BTW.
*/
--extern __inline__ unsigned long find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
+-static __inline__ unsigned long find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
+static __inline__ unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size, unsigned long offset)
{
- unsigned long *p = ((unsigned long *) addr) + (offset >> 6);
unsigned long result = offset & ~63UL;
unsigned long tmp;
-@@ -211,15 +290,15 @@
- #define find_first_zero_bit(addr, size) \
- find_next_zero_bit((addr), (size), 0)
-
--extern long ___test_and_set_le_bit(int nr, volatile void *addr);
--extern long ___test_and_clear_le_bit(int nr, volatile void *addr);
-+extern long ___test_and_set_le_bit(int nr, volatile unsigned long *addr);
-+extern long ___test_and_clear_le_bit(int nr, volatile unsigned long *addr);
-
- #define test_and_set_le_bit(nr,addr) ({___test_and_set_le_bit(nr,addr)!=0;})
- #define test_and_clear_le_bit(nr,addr) ({___test_and_clear_le_bit(nr,addr)!=0;})
- #define set_le_bit(nr,addr) ((void)___test_and_set_le_bit(nr,addr))
- #define clear_le_bit(nr,addr) ((void)___test_and_clear_le_bit(nr,addr))
+@@ -241,7 +313,7 @@
+ #define test_and_clear_le_bit(nr,addr) \
+ test_and_clear_bit((nr) ^ 0x38, (addr))
--extern __inline__ int test_le_bit(int nr, __const__ void * addr)
-+static __inline__ int test_le_bit(int nr, __const__ unsigned long * addr)
+-static __inline__ int test_le_bit(int nr, __const__ void *addr)
++static __inline__ int test_le_bit(int nr, __const__ unsigned long *addr)
{
int mask;
__const__ unsigned char *ADDR = (__const__ unsigned char *) addr;
-@@ -232,9 +311,9 @@
+@@ -254,9 +326,9 @@
#define find_first_zero_le_bit(addr, size) \
find_next_zero_le_bit((addr), (size), 0)
--extern __inline__ unsigned long find_next_zero_le_bit(void *addr, unsigned long size, unsigned long offset)
+-static __inline__ unsigned long find_next_zero_le_bit(void *addr, unsigned long size, unsigned long offset)
+static __inline__ unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size, unsigned long offset)
{
- unsigned long *p = ((unsigned long *) addr) + (offset >> 6);
unsigned long result = offset & ~63UL;
unsigned long tmp;
-@@ -271,18 +350,22 @@
-
- #ifdef __KERNEL__
-
--#define ext2_set_bit test_and_set_le_bit
--#define ext2_clear_bit test_and_clear_le_bit
--#define ext2_test_bit test_le_bit
--#define ext2_find_first_zero_bit find_first_zero_le_bit
--#define ext2_find_next_zero_bit find_next_zero_le_bit
-+#define ext2_set_bit(nr,addr) test_and_set_le_bit((nr),(unsigned long *)(addr))
-+#define ext2_clear_bit(nr,addr) test_and_clear_le_bit((nr),(unsigned long *)(addr))
-+#define ext2_test_bit(nr,addr) test_le_bit((nr),(unsigned long *)(addr))
-+#define ext2_find_first_zero_bit(addr, size) \
-+ find_first_zero_le_bit((unsigned long *)(addr), (size))
-+#define ext2_find_next_zero_bit(addr, size, off) \
-+ find_next_zero_le_bit((unsigned long *)(addr), (size), (off))
-
- /* Bitmap functions for the minix filesystem. */
--#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)
-+#define minix_test_and_set_bit(nr,addr) test_and_set_bit((nr),(unsigned long *)(addr))
-+#define minix_set_bit(nr,addr) set_bit((nr),(unsigned long *)(addr))
-+#define minix_test_and_clear_bit(nr,addr) \
-+ test_and_clear_bit((nr),(unsigned long *)(addr))
-+#define minix_test_bit(nr,addr) test_bit((nr),(unsigned long *)(addr))
-+#define minix_find_first_zero_bit(addr,size) \
-+ find_first_zero_bit((unsigned long *)(addr),(size))
-
- #endif /* __KERNEL__ */
-
diff -urN linux-2.4.24.org/include/asm-sparc64/smp.h linux-2.4.24/include/asm-sparc64/smp.h
--- linux-2.4.24.org/include/asm-sparc64/smp.h 2004-02-04 20:48:01.767676594 +0100
+++ linux-2.4.24/include/asm-sparc64/smp.h 2004-02-04 20:52:54.175856518 +0100
projects / packages / kernel.git / commitdiff