diff --git a/kernel/futex.c b/kernel/futex.c
index 046cd780d057..1c68aafa664d 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3633,7 +3633,7 @@ static int __init futex_init(void)
 #if CONFIG_BASE_SMALL
 	futex_hashsize = 16;
 #else
-	futex_hashsize = roundup_pow_of_two(256 * num_possible_cpus());
+	futex_hashsize = roundup_pow_of_two(1024 * num_possible_cpus());
 #endif
 
 	futex_queues = alloc_large_system_hash("futex", sizeof(*futex_queues),
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 3e3650e94ae6..b3ce65bf3977 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -368,7 +368,7 @@ bool rcu_dynticks_curr_cpu_in_eqs(void)
  */
 int rcu_dynticks_snap(struct rcu_dynticks *rdtp)
 {
-	int snap = atomic_add_return(0, &rdtp->dynticks);
+	int snap = atomic_read(&rdtp->dynticks);
 
 	return snap & ~RCU_DYNTICK_CTRL_MASK;
 }