Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r…

…usty/linux-2.6-for-linus Pull cpumask changes from Rusty Russell: "Trivial comment changes to cpumask code. I guess it's getting boring." Boring is good. * tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: cpumask: cpulist_parse() comments correction init: add comments to keep initcall-names in sync with initcall levels cpumask: add a few comments of cpumask functions

Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r…
…usty/linux-2.6-for-linus Pull cpumask changes from Rusty Russell: "Trivial comment changes to cpumask code. I guess it's getting boring." Boring is good. * tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: cpumask: cpulist_parse() comments correction init: add comments to keep initcall-names in sync with initcall levels cpumask: add a few comments of cpumask functions
Linus Torvalds
2 parents 25918f9811 231daf0751
Showing 3 changed files Side-by-side Diff
include/linux/cpumask.h
include/linux/init.h
init/main.c
@@ -272,6 +272,8 @@
  * @cpu: cpu number (< nr_cpu_ids)
  * @cpumask: the cpumask pointer
  *
+ * Returns 1 if @cpu is set in @cpumask, else returns 0
+ *
  * No static inline type checking - see Subtlety (1) above.
  */
 #define cpumask_test_cpu(cpu, cpumask) \
@@ -282,6 +284,8 @@
  * @cpu: cpu number (< nr_cpu_ids)
  * @cpumask: the cpumask pointer
  *
+ * Returns 1 if @cpu is set in old bitmap of @cpumask, else returns 0
+ *
  * test_and_set_bit wrapper for cpumasks.
  */
 static inline int cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)
@@ -294,6 +298,8 @@
  * @cpu: cpu number (< nr_cpu_ids)
  * @cpumask: the cpumask pointer
  *
+ * Returns 1 if @cpu is set in old bitmap of @cpumask, else returns 0
+ *
  * test_and_clear_bit wrapper for cpumasks.
  */
 static inline int cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)
@@ -324,6 +330,8 @@
  * @dstp: the cpumask result
  * @src1p: the first input
  * @src2p: the second input
+ *
+ * If *@dstp is empty, returns 0, else returns 1
  */
 static inline int cpumask_and(struct cpumask *dstp,
 			       const struct cpumask *src1p,
@@ -365,6 +373,8 @@
  * @dstp: the cpumask result
  * @src1p: the first input
  * @src2p: the second input
+ *
+ * If *@dstp is empty, returns 0, else returns 1
  */
 static inline int cpumask_andnot(struct cpumask *dstp,
 				  const struct cpumask *src1p,
@@ -414,6 +424,8 @@
  * cpumask_subset - (*src1p & ~*src2p) == 0
  * @src1p: the first input
  * @src2p: the second input
+ *
+ * Returns 1 if *@src1p is a subset of *@src2p, else returns 0
  */
 static inline int cpumask_subset(const struct cpumask *src1p,
 				 const struct cpumask *src2p)
  
@@ -579,9 +591,8 @@
 }
  
 /**
- * cpulist_parse_user - extract a cpumask from a user string of ranges
+ * cpulist_parse - extract a cpumask from a user string of ranges
  * @buf: the buffer to extract from
- * @len: the length of the buffer
  * @dstp: the cpumask to set.
  *
  * Returns -errno, or 0 for success.
@@ -191,6 +191,7 @@
  * initializes variables that couldn't be statically initialized.
  *
  * This only exists for built-in code, not for modules.
+ * Keep main.c:initcall_level_names[] in sync.
  */
 #define pure_initcall(fn)		__define_initcall("0",fn,0)
  
@@ -280,7 +281,7 @@
  
 #else /* MODULE */
  
-/* Don't use these in modules, but some people do... */
+/* Don't use these in loadable modules, but some people do... */
 #define early_initcall(fn)		module_init(fn)
 #define core_initcall(fn)		module_init(fn)
 #define postcore_initcall(fn)		module_init(fn)
@@ -725,6 +725,7 @@
 	__initcall_end,
 };
  
+/* Keep these in sync with initcalls in include/linux/init.h */
 static char *initcall_level_names[] __initdata = {
 	"early",
 	"core",
...	...	@@ -272,6 +272,8 @@
272	272	* @cpu: cpu number (< nr_cpu_ids)
273	273	* @cpumask: the cpumask pointer
274	274	*
	275	+ * Returns 1 if @cpu is set in @cpumask, else returns 0
	276	+ *
275	277	* No static inline type checking - see Subtlety (1) above.
276	278	*/
277	279	#define cpumask_test_cpu(cpu, cpumask) \
...	...	@@ -282,6 +284,8 @@
282	284	* @cpu: cpu number (< nr_cpu_ids)
283	285	* @cpumask: the cpumask pointer
284	286	*
	287	+ * Returns 1 if @cpu is set in old bitmap of @cpumask, else returns 0
	288	+ *
285	289	* test_and_set_bit wrapper for cpumasks.
286	290	*/
287	291	static inline int cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask)
...	...	@@ -294,6 +298,8 @@
294	298	* @cpu: cpu number (< nr_cpu_ids)
295	299	* @cpumask: the cpumask pointer
296	300	*
	301	+ * Returns 1 if @cpu is set in old bitmap of @cpumask, else returns 0
	302	+ *
297	303	* test_and_clear_bit wrapper for cpumasks.
298	304	*/
299	305	static inline int cpumask_test_and_clear_cpu(int cpu, struct cpumask *cpumask)
...	...	@@ -324,6 +330,8 @@
324	330	* @dstp: the cpumask result
325	331	* @src1p: the first input
326	332	* @src2p: the second input
	333	+ *
	334	+ * If *@dstp is empty, returns 0, else returns 1
327	335	*/
328	336	static inline int cpumask_and(struct cpumask *dstp,
329	337	const struct cpumask *src1p,
...	...	@@ -365,6 +373,8 @@
365	373	* @dstp: the cpumask result
366	374	* @src1p: the first input
367	375	* @src2p: the second input
	376	+ *
	377	+ * If *@dstp is empty, returns 0, else returns 1
368	378	*/
369	379	static inline int cpumask_andnot(struct cpumask *dstp,
370	380	const struct cpumask *src1p,
...	...	@@ -414,6 +424,8 @@
414	424	* cpumask_subset - (src1p & ~src2p) == 0
415	425	* @src1p: the first input
416	426	* @src2p: the second input
	427	+ *
	428	+ * Returns 1 if @src1p is a subset of @src2p, else returns 0
417	429	*/
418	430	static inline int cpumask_subset(const struct cpumask *src1p,
419	431	const struct cpumask *src2p)
420	432
...	...	@@ -579,9 +591,8 @@
579	591	}
580	592
581	593	/**
582		- * cpulist_parse_user - extract a cpumask from a user string of ranges
	594	+ * cpulist_parse - extract a cpumask from a user string of ranges
583	595	* @buf: the buffer to extract from
584		- * @len: the length of the buffer
585	596	* @dstp: the cpumask to set.
586	597	*
587	598	* Returns -errno, or 0 for success.
...	...	@@ -191,6 +191,7 @@
191	191	* initializes variables that couldn't be statically initialized.
192	192	*
193	193	* This only exists for built-in code, not for modules.
	194	+ * Keep main.c:initcall_level_names[] in sync.
194	195	*/
195	196	#define pure_initcall(fn) __define_initcall("0",fn,0)
196	197
...	...	@@ -280,7 +281,7 @@
280	281
281	282	#else /* MODULE */
282	283
283		-/* Don't use these in modules, but some people do... */
	284	+/* Don't use these in loadable modules, but some people do... */
284	285	#define early_initcall(fn) module_init(fn)
285	286	#define core_initcall(fn) module_init(fn)
286	287	#define postcore_initcall(fn) module_init(fn)
...	...	@@ -725,6 +725,7 @@
725	725	__initcall_end,
726	726	};
727	727
	728	+/* Keep these in sync with initcalls in include/linux/init.h */
728	729	static char *initcall_level_names[] __initdata = {
729	730	"early",
730	731	"core",