Patchwork netif_set_xps_queue: make cpu mask const

login
register
mail settings
Submitter Michael S. Tsirkin
Date Oct. 2, 2013, 6:14 a.m.
Message ID <20131002061406.GA8809@redhat.com>
Download mbox | patch
Permalink /patch/279656/
State Accepted
Delegated to: David Miller
Headers show

Comments

Michael S. Tsirkin - Oct. 2, 2013, 6:14 a.m.
virtio wants to pass in cpumask_of(cpu), make parameter
const to avoid build warnings.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/linux/netdevice.h | 5 +++--
 net/core/dev.c            | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
David Miller - Oct. 2, 2013, 9:07 p.m.
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 2 Oct 2013 09:14:06 +0300

> virtio wants to pass in cpumask_of(cpu), make parameter
> const to avoid build warnings.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Refresh my memory, is to accomodate a change you want to submit to
'net' or 'net-next'?  This patch only applies to 'net' cleanly.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3de49ac..25f5d2d 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2264,11 +2264,12 @@  static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 }
 
 #ifdef CONFIG_XPS
-extern int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
+extern int netif_set_xps_queue(struct net_device *dev,
+			       const struct cpumask *mask,
 			       u16 index);
 #else
 static inline int netif_set_xps_queue(struct net_device *dev,
-				      struct cpumask *mask,
+				      const struct cpumask *mask,
 				      u16 index)
 {
 	return 0;
diff --git a/net/core/dev.c b/net/core/dev.c
index 5c713f2..f18eebd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1917,7 +1917,8 @@  static struct xps_map *expand_xps_map(struct xps_map *map,
 	return new_map;
 }
 
-int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask, u16 index)
+int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
+			u16 index)
 {
 	struct xps_dev_maps *dev_maps, *new_dev_maps = NULL;
 	struct xps_map *map, *new_map;