summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-04-29 15:07:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 15:54:31 -0700
commitdd6911efb54ce04cc9dc81745b6a96ecf1b4ce5e (patch)
tree893623f6c825d88e83527cbf5fc7f7aed0e1a8c8
parentcfa11e08ed39eb28a9eff9a907b20913020c69b5 (diff)
downloadlinux-3.10-dd6911efb54ce04cc9dc81745b6a96ecf1b4ce5e.tar.gz
linux-3.10-dd6911efb54ce04cc9dc81745b6a96ecf1b4ce5e.tar.bz2
linux-3.10-dd6911efb54ce04cc9dc81745b6a96ecf1b4ce5e.zip
mm/ARM: use free_highmem_page() to free highmem pages into buddy system
Use helper function free_highmem_page() to free highmem pages into the buddy system. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm/mm/init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 611f21772fa..9a5cdc01fcd 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -522,10 +522,8 @@ static void __init free_unused_memmap(struct meminfo *mi)
#ifdef CONFIG_HIGHMEM
static inline void free_area_high(unsigned long pfn, unsigned long end)
{
- for (; pfn < end; pfn++) {
- __free_reserved_page(pfn_to_page(pfn));
- totalhigh_pages++;
- }
+ for (; pfn < end; pfn++)
+ free_highmem_page(pfn_to_page(pfn));
}
#endif
@@ -574,7 +572,6 @@ static void __init free_highpages(void)
if (start < end)
free_area_high(start, end);
}
- totalram_pages += totalhigh_pages;
#endif
}