o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 21 insertions, 0 deletions

diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 89668887e..d1b1d7152 100644
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -372,6 +372,27 @@ extern __inline__ unsigned long ffz(unsigned long word)
 	return __res;
 }
 
+#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)
+
+/*
+ * hweightN: returns the hamming weight (i.e. the number
+ * of bits set) of a N-bit word
+ */
+
+#define hweight32(x) generic_hweight32(x)
+#define hweight16(x) generic_hweight16(x)
+#define hweight8(x) generic_hweight8(x)
+
+#endif /* __KERNEL__ */
+
 #ifdef __MIPSEB__
 /* For now I steal the Sparc C versions, no need for speed, just need to
  * get it working.