From ce835e513a93a4dc0d7bf72fc205a0b815f305e3 Mon Sep 17 00:00:00 2001 From: Tkhai Kirill Date: Tue, 19 Mar 2013 15:12:08 +0000 Subject: [PATCH] sparc64: Do not change num_physpages during initmem freeing Common hibernation code looks at num_physpages during suspend and restore. Restore is able to be called from initcall, which is before initmem freeing. This case leads to restore fail. Signed-off-by: Kirill Tkhai CC: David Miller CC: Sam Ravnborg Signed-off-by: David S. Miller --- arch/sparc/mm/init_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 1588d33..076068f 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2125,7 +2125,6 @@ void free_initmem(void) ClearPageReserved(p); init_page_count(p); __free_page(p); - num_physpages++; totalram_pages++; } } @@ -2142,7 +2141,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) ClearPageReserved(p); init_page_count(p); __free_page(p); - num_physpages++; totalram_pages++; } } -- 2.7.4