Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757499AbaFTThV (ORCPT ); Fri, 20 Jun 2014 15:37:21 -0400 Received: from qmta07.emeryville.ca.mail.comcast.net ([76.96.30.64]:56352 "EHLO qmta07.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754294AbaFTTcA (ORCPT ); Fri, 20 Jun 2014 15:32:00 -0400 Message-Id: <20140620193126.525782843@linux.com> Date: Fri, 20 Jun 2014 14:31:29 -0500 From: Christoph Lameter To: Tejun Heo Cc: akpm@linuxfoundation.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Thomas Gleixner Subject: [PATCH 14/31] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14 References: <20140620193115.547427118@linux.com> Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=tilegx Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Another case was merged for 3.14-rc1 Signed-off-by: Christoph Lameter Index: linux/drivers/net/ethernet/tile/tilegx.c =================================================================== --- linux.orig/drivers/net/ethernet/tile/tilegx.c 2014-06-16 09:41:27.945083708 -0500 +++ linux/drivers/net/ethernet/tile/tilegx.c 2014-06-16 09:41:52.264609275 -0500 @@ -551,7 +551,7 @@ static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, gxio_mpipe_idesc_t *idesc, unsigned long len) { - struct tile_net_info *info = &__get_cpu_var(per_cpu_info); + struct tile_net_info *info = this_cpu_ptr(&per_cpu_info); struct tile_net_priv *priv = netdev_priv(dev); int instance = priv->instance; @@ -1927,7 +1927,7 @@ */ static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev) { - struct tile_net_info *info = &__get_cpu_var(per_cpu_info); + struct tile_net_info *info = this_cpu_ptr(&per_cpu_info); struct tile_net_priv *priv = netdev_priv(dev); int channel = priv->echannel; int instance = priv->instance; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/