Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15

This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c

1 files changed, 8 insertions, 21 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 16f4b46161d4..2998989e76db 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -73,6 +73,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, struct sk_buff *skb)
 
         if ((flow->key.eth.type == htons(ETH_P_IP) ||
              flow->key.eth.type == htons(ETH_P_IPV6)) &&
+            flow->key.ip.frag != OVS_FRAG_TYPE_LATER &&
             flow->key.ip.proto == IPPROTO_TCP &&
             likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
                 tcp_flags = TCP_FLAGS_BE16(tcp_hdr(skb));
@@ -91,7 +92,7 @@ static void stats_read(struct flow_stats *stats,
                        unsigned long *used, __be16 *tcp_flags)
 {
         spin_lock(&stats->lock);
-        if (time_after(stats->used, *used))
+        if (!*used || time_after(stats->used, *used))
                 *used = stats->used;
         *tcp_flags |= stats->tcp_flags;
         ovs_stats->n_packets += stats->packet_count;
@@ -102,30 +103,24 @@ static void stats_read(struct flow_stats *stats,
 void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
                         unsigned long *used, __be16 *tcp_flags)
 {
-        int cpu, cur_cpu;
+        int cpu;
 
         *used = 0;
         *tcp_flags = 0;
         memset(ovs_stats, 0, sizeof(*ovs_stats));
 
+        local_bh_disable();
         if (!flow->stats.is_percpu) {
                 stats_read(flow->stats.stat, ovs_stats, used, tcp_flags);
         } else {
-                cur_cpu = get_cpu();
                 for_each_possible_cpu(cpu) {
                         struct flow_stats *stats;
 
-                        if (cpu == cur_cpu)
-                                local_bh_disable();
-
                         stats = per_cpu_ptr(flow->stats.cpu_stats, cpu);
                         stats_read(stats, ovs_stats, used, tcp_flags);
-
-                        if (cpu == cur_cpu)
-                                local_bh_enable();
                 }
-                put_cpu();
         }
+        local_bh_enable();
 }
 
 static void stats_reset(struct flow_stats *stats)
@@ -140,25 +135,17 @@ static void stats_reset(struct flow_stats *stats)
 
 void ovs_flow_stats_clear(struct sw_flow *flow)
 {
-        int cpu, cur_cpu;
+        int cpu;
 
+        local_bh_disable();
         if (!flow->stats.is_percpu) {
                 stats_reset(flow->stats.stat);
         } else {
-                cur_cpu = get_cpu();
-
                 for_each_possible_cpu(cpu) {
-
-                        if (cpu == cur_cpu)
-                                local_bh_disable();
-
                         stats_reset(per_cpu_ptr(flow->stats.cpu_stats, cpu));
-
-                        if (cpu == cur_cpu)
-                                local_bh_enable();
                 }
-                put_cpu();
         }
+        local_bh_enable();
 }
 
 static int check_header(struct sk_buff *skb, int len)