diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /mm/percpu.c | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index c5feb79f5995..8eb536645f68 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -1648,8 +1648,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, | |||
1648 | /* warn if maximum distance is further than 75% of vmalloc space */ | 1648 | /* warn if maximum distance is further than 75% of vmalloc space */ |
1649 | if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) { | 1649 | if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) { |
1650 | pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc " | 1650 | pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc " |
1651 | "space 0x%lx\n", | 1651 | "space 0x%lx\n", max_distance, |
1652 | max_distance, VMALLOC_END - VMALLOC_START); | 1652 | (unsigned long)(VMALLOC_END - VMALLOC_START)); |
1653 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK | 1653 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK |
1654 | /* and fail if we have fallback */ | 1654 | /* and fail if we have fallback */ |
1655 | rc = -EINVAL; | 1655 | rc = -EINVAL; |