diff --git a/[refs] b/[refs]
index e413b1a6b5c5..7d0947023c95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc09b5f6466528867b280f6eb4077311aa099588
+refs/heads/master: 8587523640441a9ff2564ebc6efeb39497ad6709
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 93e44dbf6793..4c907895876b 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2563,7 +2563,8 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
 
 	map = rcu_dereference(rxqueue->rps_map);
 	if (map) {
-		if (map->len == 1) {
+		if (map->len == 1 &&
+		    !rcu_dereference_raw(rxqueue->rps_flow_table)) {
 			tcpu = map->cpus[0];
 			if (cpu_online(tcpu))
 				cpu = tcpu;