Automatic merge with /usr/src/ntfs-2.6.git.

3 files changed, 8 insertions, 25 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 455833a9e3..eeb429a521 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -63,32 +63,16 @@ config REED_SOLOMON_ENC16
 config REED_SOLOMON_DEC16
         boolean
 
+#
+# Textsearch support is select'ed if needed
+#
 config TEXTSEARCH
-        boolean "Textsearch infrastructure"
-        default y
-        help
-          Say Y here if you want to provide a textsearch infrastructure
-          to other subsystems.
+        boolean
 
 config TEXTSEARCH_KMP
-        depends on TEXTSEARCH
-        tristate "Knuth-Morris-Pratt"
-        help
-          Say Y here if you want to be able to search text using the
-          Knuth-Morris-Pratt textsearch algorithm.
-
-          To compile this code as a module, choose M here: the
-          module will be called ts_kmp.
+        tristate
 
 config TEXTSEARCH_FSM
-        depends on TEXTSEARCH
-        tristate "Finite state machine"
-        help
-          Say Y here if you want to be able to search text using a
-          naive finite state machine approach implementing a subset
-          of regular expressions.
-
-          To compile this code as a module, choose M here: the
-          module will be called ts_fsm.
+        tristate
 
 endmenu
diff --git a/lib/bitmap.c b/lib/bitmap.c
index d1388a5ce8..fb9371fdd4 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -289,7 +289,6 @@ EXPORT_SYMBOL(__bitmap_weight);
 
 #define CHUNKSZ                         32
 #define nbits_to_hold_value(val)        fls(val)
-#define roundup_power2(val,modulus)     (((val) + (modulus) - 1) & ~((modulus) - 1))
 #define unhex(c)                        (isdigit(c) ? (c - '0') : (toupper(c) - 'A' + 10))
 #define BASEDEC 10              /* fancier cpuset lists input in decimal */
 
@@ -316,7 +315,7 @@ int bitmap_scnprintf(char *buf, unsigned int buflen,
         if (chunksz == 0)
                 chunksz = CHUNKSZ;
 
-        i = roundup_power2(nmaskbits, CHUNKSZ) - CHUNKSZ;
+        i = ALIGN(nmaskbits, CHUNKSZ) - CHUNKSZ;
         for (; i >= 0; i -= CHUNKSZ) {
                 chunkmask = ((1ULL << chunksz) - 1);
                 word = i / BITS_PER_LONG;
diff --git a/lib/sha1.c b/lib/sha1.c
index 2f7f1148df..1cdabe3065 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -41,7 +41,7 @@ void sha_transform(__u32 *digest, const char *in, __u32 *W)
         __u32 a, b, c, d, e, t, i;
 
         for (i = 0; i < 16; i++)
-                W[i] = be32_to_cpu(((const __u32 *)in)[i]);
+                W[i] = be32_to_cpu(((const __be32 *)in)[i]);
 
         for (i = 0; i < 64; i++)
                 W[i+16] = rol32(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i], 1);