Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks into timers/core

3 files changed, 11 insertions, 8 deletions

diff --git a/lib/btree.c b/lib/btree.c
index e5ec1e9c1aa5..f9a484676cb6 100644
--- a/lib/btree.c
+++ b/lib/btree.c
@@ -319,8 +319,8 @@ void *btree_get_prev(struct btree_head *head, struct btree_geo *geo,
 
         if (head->height == 0)
                 return NULL;
-retry:
         longcpy(key, __key, geo->keylen);
+retry:
         dec_key(geo, key);
 
         node = head->node;
@@ -351,7 +351,7 @@ retry:
         }
 miss:
         if (retry_key) {
-                __key = retry_key;
+                longcpy(key, retry_key, geo->keylen);
                 retry_key = NULL;
                 goto retry;
         }
@@ -509,6 +509,7 @@ retry:
 int btree_insert(struct btree_head *head, struct btree_geo *geo,
                 unsigned long *key, void *val, gfp_t gfp)
 {
+        BUG_ON(!val);
         return btree_insert_level(head, geo, key, val, 1, gfp);
 }
 EXPORT_SYMBOL_GPL(btree_insert);
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c
index 1805a5cc5daa..a95bccb8497d 100644
--- a/lib/raid6/recov.c
+++ b/lib/raid6/recov.c
@@ -22,8 +22,8 @@
 #include <linux/raid/pq.h>
 
 /* Recover two failed data blocks. */
-void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb,
-                       void **ptrs)
+static void raid6_2data_recov_intx1(int disks, size_t bytes, int faila,
+                int failb, void **ptrs)
 {
         u8 *p, *q, *dp, *dq;
         u8 px, qx, db;
@@ -66,7 +66,8 @@ void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb,
 }
 
 /* Recover failure of one data block plus the P block */
-void raid6_datap_recov_intx1(int disks, size_t bytes, int faila, void **ptrs)
+static void raid6_datap_recov_intx1(int disks, size_t bytes, int faila,
+                void **ptrs)
 {
         u8 *p, *q, *dq;
         const u8 *qmul;         /* Q multiplier table */
diff --git a/lib/raid6/recov_ssse3.c b/lib/raid6/recov_ssse3.c
index 37ae61930559..ecb710c0b4d9 100644
--- a/lib/raid6/recov_ssse3.c
+++ b/lib/raid6/recov_ssse3.c
@@ -19,8 +19,8 @@ static int raid6_has_ssse3(void)
                 boot_cpu_has(X86_FEATURE_SSSE3);
 }
 
-void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila, int failb,
-                       void **ptrs)
+static void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila,
+                int failb, void **ptrs)
 {
         u8 *p, *q, *dp, *dq;
         const u8 *pbmul;        /* P multiplier table for B data */
@@ -194,7 +194,8 @@ void raid6_2data_recov_ssse3(int disks, size_t bytes, int faila, int failb,
 }
 
 
-void raid6_datap_recov_ssse3(int disks, size_t bytes, int faila, void **ptrs)
+static void raid6_datap_recov_ssse3(int disks, size_t bytes, int faila,
+                void **ptrs)
 {
         u8 *p, *q, *dq;
         const u8 *qmul;         /* Q multiplier table */