diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
| commit | 08c473f52af7434b09214fedcfce222fb9821033 (patch) | |
| tree | 555dc016292a132bd55096d42c945c61c6394174 /mm | |
| parent | 9ae3b66a8ea648d977cbcebf02209f21cc9be3a4 (diff) | |
| parent | 57ade285e32285186879f96c346dd5b45a7f0dd6 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/plat-mxc/cpufreq.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e2f474da7ee2..f6c453df09bb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1489,7 +1489,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, long min = mark; int o; - free_pages -= (1 << order) + 1; + free_pages -= (1 << order) - 1; if (alloc_flags & ALLOC_HIGH) min -= min / 2; if (alloc_flags & ALLOC_HARDER) |