summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-08 11:06:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-08 11:06:07 -0700
commite9b19cd43f3f55a7f1d1c9a033feda8dabce3be6 (patch)
tree2cb60b7af0bba9f69eb54db66f6e25f7c0fc898c /mm
parent301cdf5c75695addaaf3b4857b6df7a1d764503e (diff)
parentd5e28005a1d2e67833852f4c9ea8ec206ea3ff85 (diff)
downloadlinux-3.10-e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6.tar.gz
linux-3.10-e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6.tar.bz2
linux-3.10-e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6.zip
Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull two percpu fixes from Tejun Heo: "One adds missing KERN_CONT on split printk()s and the other makes the percpu allocator avoid using PMD_SIZE as atom_size on x86_32. Using PMD_SIZE led to vmalloc area exhaustion on certain configurations (x86_32 android) and the only cost of using PAGE_SIZE instead is static percpu area not being aligned to large page mapping." * 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit percpu: use KERN_CONT in pcpu_dump_alloc_info()
Diffstat (limited to 'mm')
-rw-r--r--mm/percpu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index f47af9123af..f921fdfb543 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1132,20 +1132,20 @@ static void pcpu_dump_alloc_info(const char *lvl,
for (alloc_end += gi->nr_units / upa;
alloc < alloc_end; alloc++) {
if (!(alloc % apl)) {
- printk("\n");
+ printk(KERN_CONT "\n");
printk("%spcpu-alloc: ", lvl);
}
- printk("[%0*d] ", group_width, group);
+ printk(KERN_CONT "[%0*d] ", group_width, group);
for (unit_end += upa; unit < unit_end; unit++)
if (gi->cpu_map[unit] != NR_CPUS)
- printk("%0*d ", cpu_width,
+ printk(KERN_CONT "%0*d ", cpu_width,
gi->cpu_map[unit]);
else
- printk("%s ", empty_str);
+ printk(KERN_CONT "%s ", empty_str);
}
}
- printk("\n");
+ printk(KERN_CONT "\n");
}
/**