aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTkhai Kirill <tkhai@yandex.ru>2013-03-19 15:12:08 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-20 11:06:54 -0700
commitce835e513a93a4dc0d7bf72fc205a0b815f305e3 (patch)
tree91e4748196feac3604a9706d6eb566c224debd90
parentbdde6b3c8ba48fa5847b6d75f0541c8b8db9205c (diff)
downloadkernel_goldelico_gta04-ce835e513a93a4dc0d7bf72fc205a0b815f305e3.zip
kernel_goldelico_gta04-ce835e513a93a4dc0d7bf72fc205a0b815f305e3.tar.gz
kernel_goldelico_gta04-ce835e513a93a4dc0d7bf72fc205a0b815f305e3.tar.bz2
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 <tkhai@yandex.ru> CC: David Miller <davem@davemloft.net> CC: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/mm/init_64.c2
1 files changed, 0 insertions, 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++;
}
}