Merge tag 'char-misc-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / net / core / drop_monitor.c

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 50f9a9db57924decc06d50296b77dcfe1ac5fcc9..252e155c837b7532778ef558c9c3cb47a68a654b 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -146,7 +146,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
        unsigned long flags;
 
        local_irq_save(flags);
-       data = &__get_cpu_var(dm_cpu_data);
+       data = this_cpu_ptr(&dm_cpu_data);
        spin_lock(&data->lock);
        dskb = data->skb;