Skip to content

Commit eee8492

Browse files
Christoph Lameterhtejun
authored andcommitted
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>
1 parent bd83e65 commit eee8492

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/tile/tilegx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf)
551551
static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb,
552552
gxio_mpipe_idesc_t *idesc, unsigned long len)
553553
{
554-
struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
554+
struct tile_net_info *info = this_cpu_ptr(&per_cpu_info);
555555
struct tile_net_priv *priv = netdev_priv(dev);
556556
int instance = priv->instance;
557557

@@ -1927,7 +1927,7 @@ static void tso_egress(struct net_device *dev, gxio_mpipe_equeue_t *equeue,
19271927
*/
19281928
static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
19291929
{
1930-
struct tile_net_info *info = &__get_cpu_var(per_cpu_info);
1930+
struct tile_net_info *info = this_cpu_ptr(&per_cpu_info);
19311931
struct tile_net_priv *priv = netdev_priv(dev);
19321932
int channel = priv->echannel;
19331933
int instance = priv->instance;

0 commit comments

Comments
 (0)