summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-29 11:24:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-29 11:24:28 -0700
commit6e49ba1bb1deddd2da806284a37e7f3d3d711301 (patch)
treeaa707aa3140bd7dc1853051c1c1a7bd9d280ebd4 /include
parentd0af69886656a93a8c4e9b5bb8f1894a50cf2d8a (diff)
parentf36963c9d3f6f415732710da3acdd8608a9fa0e5 (diff)
downloadlinux-6e49ba1bb1deddd2da806284a37e7f3d3d711301.tar.gz
linux-6e49ba1bb1deddd2da806284a37e7f3d3d711301.tar.bz2
linux-6e49ba1bb1deddd2da806284a37e7f3d3d711301.zip
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull fixes for cpumask and modules from Rusty Russell: "** NOW WITH TESTING! ** Two fixes which got lost in my recent distraction. One is a weird cpumask function which needed to be rewritten, the other is a module bug which is cc:stable" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: cpumask_set_cpu_local_first => cpumask_local_spread, lament module: Call module notifier on failure after complete_formation()
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpumask.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 27e285b92b5f..59915ea5373c 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -151,10 +151,8 @@ static inline unsigned int cpumask_any_but(const struct cpumask *mask,
return 1;
}
-static inline int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp)
+static inline unsigned int cpumask_local_spread(unsigned int i, int node)
{
- set_bit(0, cpumask_bits(dstp));
-
return 0;
}
@@ -208,7 +206,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
-int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
+unsigned int cpumask_local_spread(unsigned int i, int node);
/**
* for_each_cpu - iterate over every cpu in a mask