diff options
| author | Christoph Lameter <cl@linux.com> | 2014-08-17 13:30:38 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-26 13:45:48 -0400 |
| commit | eee8492db674a5c89daa83158d8bf2839efc8850 (patch) | |
| tree | b90e0f87fa90aa18c33e10913852795b5f295ed6 | |
| parent | bd83e65bfaedafef1ba21ce19c1ea7913da01bec (diff) | |
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>
| -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) | |||
| 551 | static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, | 551 | static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, |
| 552 | gxio_mpipe_idesc_t *idesc, unsigned long len) | 552 | gxio_mpipe_idesc_t *idesc, unsigned long len) |
| 553 | { | 553 | { |
| 554 | struct tile_net_info *info = &__get_cpu_var(per_cpu_info); | 554 | struct tile_net_info *info = this_cpu_ptr(&per_cpu_info); |
| 555 | struct tile_net_priv *priv = netdev_priv(dev); | 555 | struct tile_net_priv *priv = netdev_priv(dev); |
| 556 | int instance = priv->instance; | 556 | int instance = priv->instance; |
| 557 | 557 | ||
| @@ -1927,7 +1927,7 @@ static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue, | |||
| 1927 | */ | 1927 | */ |
| 1928 | static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev) | 1928 | static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev) |
| 1929 | { | 1929 | { |
| 1930 | struct tile_net_info *info = &__get_cpu_var(per_cpu_info); | 1930 | struct tile_net_info *info = this_cpu_ptr(&per_cpu_info); |
| 1931 | struct tile_net_priv *priv = netdev_priv(dev); | 1931 | struct tile_net_priv *priv = netdev_priv(dev); |
| 1932 | int channel = priv->echannel; | 1932 | int channel = priv->echannel; |
| 1933 | int instance = priv->instance; | 1933 | int instance = priv->instance; |