From 8cf448943ea81af5b62d8866f6fd9137f61153f7 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Mon, 29 Apr 2013 15:07:06 -0700 Subject: [PATCH] --- yaml --- r: 365384 b: refs/heads/master c: ec601a34f5bbe9d155181410d854e3875df57c8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/microblaze/mm/init.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b1e0722b676b..00f9259dee6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a564496e2cf9ea37a553d27c8ca4cef78015b2e2 +refs/heads/master: ec601a34f5bbe9d155181410d854e3875df57c8b diff --git a/trunk/arch/microblaze/mm/init.c b/trunk/arch/microblaze/mm/init.c index 9be53024a832..4ec137d13ad7 100644 --- a/trunk/arch/microblaze/mm/init.c +++ b/trunk/arch/microblaze/mm/init.c @@ -82,13 +82,9 @@ static unsigned long highmem_setup(void) /* FIXME not sure about */ if (memblock_is_reserved(pfn << PAGE_SHIFT)) continue; - ClearPageReserved(page); - init_page_count(page); - __free_page(page); - totalhigh_pages++; + free_highmem_page(page); reservedpages++; } - totalram_pages += totalhigh_pages; pr_info("High memory: %luk\n", totalhigh_pages << (PAGE_SHIFT-10));