diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /mm/vmscan.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index f73b8657c2d0..c7f5a6d4b75b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1065,7 +1065,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, | |||
| 1065 | * surrounding the tag page. Only take those pages of | 1065 | * surrounding the tag page. Only take those pages of |
| 1066 | * the same active state as that tag page. We may safely | 1066 | * the same active state as that tag page. We may safely |
| 1067 | * round the target page pfn down to the requested order | 1067 | * round the target page pfn down to the requested order |
| 1068 | * as the mem_map is guarenteed valid out to MAX_ORDER, | 1068 | * as the mem_map is guaranteed valid out to MAX_ORDER, |
| 1069 | * where that page is in a different zone we will detect | 1069 | * where that page is in a different zone we will detect |
| 1070 | * it from its zone id and abort this block scan. | 1070 | * it from its zone id and abort this block scan. |
| 1071 | */ | 1071 | */ |
| @@ -2224,7 +2224,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont, | |||
| 2224 | * o a 16M DMA zone that is balanced will not balance a zone on any | 2224 | * o a 16M DMA zone that is balanced will not balance a zone on any |
| 2225 | * reasonable sized machine | 2225 | * reasonable sized machine |
| 2226 | * o On all other machines, the top zone must be at least a reasonable | 2226 | * o On all other machines, the top zone must be at least a reasonable |
| 2227 | * precentage of the middle zones. For example, on 32-bit x86, highmem | 2227 | * percentage of the middle zones. For example, on 32-bit x86, highmem |
| 2228 | * would need to be at least 256M for it to be balance a whole node. | 2228 | * would need to be at least 256M for it to be balance a whole node. |
| 2229 | * Similarly, on x86-64 the Normal zone would need to be at least 1G | 2229 | * Similarly, on x86-64 the Normal zone would need to be at least 1G |
| 2230 | * to balance a node on its own. These seemed like reasonable ratios. | 2230 | * to balance a node on its own. These seemed like reasonable ratios. |