diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-08 11:06:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-08 11:06:07 -0700 |
commit | e9b19cd43f3f55a7f1d1c9a033feda8dabce3be6 (patch) | |
tree | 2cb60b7af0bba9f69eb54db66f6e25f7c0fc898c /arch/alpha/kernel/err_ev7.c | |
parent | 301cdf5c75695addaaf3b4857b6df7a1d764503e (diff) | |
parent | d5e28005a1d2e67833852f4c9ea8ec206ea3ff85 (diff) |
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 'arch/alpha/kernel/err_ev7.c')
0 files changed, 0 insertions, 0 deletions