diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2013-10-02 09:14:06 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-07 12:29:26 -0400 |
commit | 3573540cafa4296dd60f8be02f2aecaa31047525 (patch) | |
tree | d1df5c4648f5cead63251abc03409cce50c40928 | |
parent | 5e8a402f831dbe7ee831340a91439e46f0d38acd (diff) | |
download | op-kernel-dev-3573540cafa4296dd60f8be02f2aecaa31047525.zip op-kernel-dev-3573540cafa4296dd60f8be02f2aecaa31047525.tar.gz |
netif_set_xps_queue: make cpu mask const
virtio wants to pass in cpumask_of(cpu), make parameter
const to avoid build warnings.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/netdevice.h | 5 | ||||
-rw-r--r-- | net/core/dev.c | 3 |
2 files changed, 5 insertions, 3 deletions
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 65f829c..3430b1e 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; |