Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee8492d authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14 



Another case was merged for 3.14-rc1

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent bd83e65b

drivers/net/ethernet/tile/tilegx.c

+2 −2
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf) 
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 void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue, 
 */

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;