Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43a1141b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cpumask-for-linus' of... 

Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/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
parents 25918f98 231daf07

include/linux/cpumask.h

+13 −2
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static inline void cpumask_clear_cpu(int cpu, struct cpumask *dstp) 
 * @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 @@ static inline void cpumask_clear_cpu(int cpu, struct cpumask *dstp) 
 * @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 @@ static inline int cpumask_test_and_set_cpu(int cpu, struct cpumask *cpumask) 
 * @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 @@ static inline void cpumask_clear(struct cpumask *dstp) 
 * @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 @@ static inline void cpumask_xor(struct cpumask *dstp, 
 * @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 @@ static inline bool cpumask_intersects(const struct cpumask *src1p, 
 * 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 @@ static inline int cpulist_scnprintf(char *buf, int len, 
}



/**

 * 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.

include/linux/init.h

+2 −1
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ extern bool initcall_debug; 
 * 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 @@ void __init parse_early_options(char *cmdline); 


#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)

init/main.c

+1 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ static initcall_t *initcall_levels[] __initdata = { 
	__initcall_end,

};



/* Keep these in sync with initcalls in include/linux/init.h */

static char *initcall_level_names[] __initdata = {

	"early",

	"core",