Commit f1bbc032 authored Feb 13, 2015 by Tejun Heo Committed by Linus Torvalds Feb 13, 2015

cpumask, nodemask: implement cpumask/nodemask_pr_args()



printf family of functions can now format bitmaps using '%*pb[l]' and
all cpumask and nodemask formatting will be converted to use it.  To
ease printing these masks with '%*pb[l]' which require two params -
the number of bits and the actual bitmap, this patch implement
cpumask_pr_args() and nodemask_pr_args() which can be used to provide
arguments for '%*pb[l]'

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Christoph Lameter <cl@linux.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Travis <travis@sgi.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dbc760bc

include/linux/cpumask.h

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,14 @@ typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;
	*/		*/
	#define cpumask_bits(maskp) ((maskp)->bits)		#define cpumask_bits(maskp) ((maskp)->bits)

			/**
			* cpumask_pr_args - printf args to output a cpumask
			* @maskp: cpumask to be printed
			*
			* Can be used to provide arguments for '%*pb[l]' when printing a cpumask.
			*/
			#define cpumask_pr_args(maskp) nr_cpu_ids, cpumask_bits(maskp)

	#if NR_CPUS == 1		#if NR_CPUS == 1
	#define nr_cpu_ids 1		#define nr_cpu_ids 1
	#else		#else

include/linux/nodemask.h

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,14 @@
	typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;		typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;
	extern nodemask_t _unused_nodemask_arg_;		extern nodemask_t _unused_nodemask_arg_;

			/**
			* nodemask_pr_args - printf args to output a nodemask
			* @maskp: nodemask to be printed
			*
			* Can be used to provide arguments for '%*pb[l]' when printing a nodemask.
			*/
			#define nodemask_pr_args(maskp) MAX_NUMNODES, (maskp)->bits

	/*		/*
	* The inline keyword gives the compiler room to decide to inline, or		* The inline keyword gives the compiler room to decide to inline, or
	* not inline a function as it sees best. However, as these functions		* not inline a function as it sees best. However, as these functions