summaryrefslogtreecommitdiffstats
path: root/kernel/lib/rhashtable.c
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-19 08:35:30 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-19 08:35:30 +0300
commitec0a2ed6d8a5e555edef907895c041e285fdb495 (patch)
treea4c8d982f8ac820b1b60818df22ad3ccac2036d5 /kernel/lib/rhashtable.c
parent342fa5dfa053559f47caad657132522496dcf1b3 (diff)
These changes are a raw update to a vanilla kernel 4.1.10, with the
recently announced rt patch patch-4.1.10-rt10.patch. No further changes needed. Change-Id: I9a0cf084498133b10771e744b6da4b29dff706ba Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/lib/rhashtable.c')
-rw-r--r--kernel/lib/rhashtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/lib/rhashtable.c b/kernel/lib/rhashtable.c
index 8609378e6..cf910e48f 100644
--- a/kernel/lib/rhashtable.c
+++ b/kernel/lib/rhashtable.c
@@ -612,6 +612,8 @@ next:
iter->skip = 0;
}
+ iter->p = NULL;
+
/* Ensure we see any new tables. */
smp_rmb();
@@ -622,8 +624,6 @@ next:
return ERR_PTR(-EAGAIN);
}
- iter->p = NULL;
-
out:
return obj;