Re: [PATCH 14/31] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14

2014-07-18 Thread Tejun Heo
On Fri, Jun 20, 2014 at 02:31:29PM -0500, Christoph Lameter wrote:
> Another case was merged for 3.14-rc1
> 
> Signed-off-by: Christoph Lameter 

Applied to wq/for-3.17-consistent-ops.  If this patch should be routed
differently, please holler.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 14/31] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14

2014-07-18 Thread Tejun Heo
On Fri, Jun 20, 2014 at 02:31:29PM -0500, Christoph Lameter wrote:
 Another case was merged for 3.14-rc1
 
 Signed-off-by: Christoph Lameter c...@linux.com

Applied to wq/for-3.17-consistent-ops.  If this patch should be routed
differently, please holler.

Thanks.

-- 
tejun
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 14/31] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14

2014-06-20 Thread Christoph Lameter
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.c2014-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(_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(_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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 14/31] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14

2014-06-20 Thread Christoph Lameter
Another case was merged for 3.14-rc1

Signed-off-by: Christoph Lameter c...@linux.com

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.c2014-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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/