diff options
author | Tkhai Kirill <tkhai@yandex.ru> | 2013-03-19 11:12:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-20 14:06:54 -0400 |
commit | ce835e513a93a4dc0d7bf72fc205a0b815f305e3 (patch) | |
tree | 91e4748196feac3604a9706d6eb566c224debd90 /arch/sparc/mm | |
parent | bdde6b3c8ba48fa5847b6d75f0541c8b8db9205c (diff) |
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>
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/init_64.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 1588d33d5492..076068f4459e 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -2125,7 +2125,6 @@ void free_initmem(void) | |||
2125 | ClearPageReserved(p); | 2125 | ClearPageReserved(p); |
2126 | init_page_count(p); | 2126 | init_page_count(p); |
2127 | __free_page(p); | 2127 | __free_page(p); |
2128 | num_physpages++; | ||
2129 | totalram_pages++; | 2128 | totalram_pages++; |
2130 | } | 2129 | } |
2131 | } | 2130 | } |
@@ -2142,7 +2141,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
2142 | ClearPageReserved(p); | 2141 | ClearPageReserved(p); |
2143 | init_page_count(p); | 2142 | init_page_count(p); |
2144 | __free_page(p); | 2143 | __free_page(p); |
2145 | num_physpages++; | ||
2146 | totalram_pages++; | 2144 | totalram_pages++; |
2147 | } | 2145 | } |
2148 | } | 2146 | } |