Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha512 - use standard ror64()

diff --combined include/linux/bitops.h
index 3c1063acb2abd6e7db59b0f7de4a756630f7e375,fc8a3ffce3204b7f887c401bb2e14bfc229cc5fd..94300fe46ccedd4ca5333fad2b0bac4a74b704b0
--- 1/include/linux/bitops.h
--- 2/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@@ -22,14 -22,8 +22,14 @@@ extern unsigned long __sw_hweight64(__u
  #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_cont(bit, addr, size) \
 +      for ((bit) = find_next_bit((addr), (size), (bit));      \
 +           (bit) < (size);                                    \
             (bit) = find_next_bit((addr), (size), (bit) + 1))
  
  static __inline__ int get_bitmask_order(unsigned int count)
@@@ -55,6 -49,26 +55,26 @@@ static inline unsigned long hweight_lon
        return sizeof(w) == 4 ? hweight32(w) : hweight64(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