Patched in Tegra support.

1 files changed, 2 insertions, 39 deletions

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index a3b6b82108b..a3ef66a2a08 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -22,27 +22,10 @@ extern unsigned long __sw_hweight64(__u64 w);
 #include <asm/bitops.h>
 
 #define for_each_set_bit(bit, addr, size) \
-        for ((bit) = find_first_bit((addr), (size));            \
-             (bit) < (size);                                    \
+        for ((bit) = find_first_bit((addr), (size)); \
+             (bit) < (size); \
              (bit) = find_next_bit((addr), (size), (bit) + 1))
 
-/* same as for_each_set_bit() but use bit as value to start with */
-#define for_each_set_bit_from(bit, addr, size) \
-        for ((bit) = find_next_bit((addr), (size), (bit));      \
-             (bit) < (size);                                    \
-             (bit) = find_next_bit((addr), (size), (bit) + 1))
-
-#define for_each_clear_bit(bit, addr, size) \
-        for ((bit) = find_first_zero_bit((addr), (size));       \
-             (bit) < (size);                                    \
-             (bit) = find_next_zero_bit((addr), (size), (bit) + 1))
-
-/* same as for_each_clear_bit() but use bit as value to start with */
-#define for_each_clear_bit_from(bit, addr, size) \
-        for ((bit) = find_next_zero_bit((addr), (size), (bit)); \
-             (bit) < (size);                                    \
-             (bit) = find_next_zero_bit((addr), (size), (bit) + 1))
-
 static __inline__ int get_bitmask_order(unsigned int count)
 {
         int order;
@@ -67,26 +50,6 @@ static inline unsigned long hweight_long(unsigned long w)
 }
 
 /**
- * rol64 - rotate a 64-bit value left
- * @word: value to rotate
- * @shift: bits to roll
- */
-static inline __u64 rol64(__u64 word, unsigned int shift)
-{
-        return (word << shift) | (word >> (64 - shift));
-}
-
-/**
- * ror64 - rotate a 64-bit value right
- * @word: value to rotate
- * @shift: bits to roll
- */
-static inline __u64 ror64(__u64 word, unsigned int shift)
-{
-        return (word >> shift) | (word << (64 - shift));
-}
-
-/**
  * rol32 - rotate a 32-bit value left
  * @word: value to rotate
  * @shift: bits to roll