diff options
author | Tejun Heo <tj@kernel.org> | 2015-02-13 17:37:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-14 00:21:37 -0500 |
commit | 807de073bb5c92e6e19f2c3b7075b51e9d5f6a93 (patch) | |
tree | ff29230b2a8815977371587507841fed77c5a3d9 /mm/percpu.c | |
parent | ffda22c1f316ff9c12f5911ac7a18ec3a49c9d02 (diff) |
percpu: use %*pb[l] to print bitmaps including cpumasks and nodemasks
printk and friends can now format bitmaps using '%*pb[l]'. cpumask
and nodemask also provide cpumask_pr_args() and nodemask_pr_args()
respectively which can be used to generate the two printf arguments
necessary to format the specified cpu/nodemask.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index d39e2f4e335c..73c97a5f4495 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -1528,7 +1528,6 @@ static void pcpu_dump_alloc_info(const char *lvl, | |||
1528 | int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, | 1528 | int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, |
1529 | void *base_addr) | 1529 | void *base_addr) |
1530 | { | 1530 | { |
1531 | static char cpus_buf[4096] __initdata; | ||
1532 | static int smap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata; | 1531 | static int smap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata; |
1533 | static int dmap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata; | 1532 | static int dmap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata; |
1534 | size_t dyn_size = ai->dyn_size; | 1533 | size_t dyn_size = ai->dyn_size; |
@@ -1541,12 +1540,11 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, | |||
1541 | int *unit_map; | 1540 | int *unit_map; |
1542 | int group, unit, i; | 1541 | int group, unit, i; |
1543 | 1542 | ||
1544 | cpumask_scnprintf(cpus_buf, sizeof(cpus_buf), cpu_possible_mask); | ||
1545 | |||
1546 | #define PCPU_SETUP_BUG_ON(cond) do { \ | 1543 | #define PCPU_SETUP_BUG_ON(cond) do { \ |
1547 | if (unlikely(cond)) { \ | 1544 | if (unlikely(cond)) { \ |
1548 | pr_emerg("PERCPU: failed to initialize, %s", #cond); \ | 1545 | pr_emerg("PERCPU: failed to initialize, %s", #cond); \ |
1549 | pr_emerg("PERCPU: cpu_possible_mask=%s\n", cpus_buf); \ | 1546 | pr_emerg("PERCPU: cpu_possible_mask=%*pb\n", \ |
1547 | cpumask_pr_args(cpu_possible_mask)); \ | ||
1550 | pcpu_dump_alloc_info(KERN_EMERG, ai); \ | 1548 | pcpu_dump_alloc_info(KERN_EMERG, ai); \ |
1551 | BUG(); \ | 1549 | BUG(); \ |
1552 | } \ | 1550 | } \ |