diff options
| author | Christoph Lameter <cl@linux.com> | 2014-08-17 19:30:38 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-26 19:45:48 +0200 |
| commit | eee8492db674a5c89daa83158d8bf2839efc8850 (patch) | |
| tree | b90e0f87fa90aa18c33e10913852795b5f295ed6 /drivers/net/ethernet/tile | |
| parent | metag: Replace __get_cpu_var uses for address calculation (diff) | |
| download | linux-eee8492db674a5c89daa83158d8bf2839efc8850.tar.xz linux-eee8492db674a5c89daa83158d8bf2839efc8850.zip | |
drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14
Another case was merged for 3.14-rc1
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/tile')
| -rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index e354742c3f59..049747f558c9 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -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; |