sparc64: Do not change num_physpages during initmem freeing
authorTkhai Kirill <tkhai@yandex.ru>
Tue, 19 Mar 2013 15:12:08 +0000 (15:12 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Mar 2013 18:06:54 +0000 (11:06 -0700)
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>
arch/sparc/mm/init_64.c

index 1588d33d549235aa67756e7e27e0321e85164514..076068f4459e4c2d627b2a60eacd58c6b8bc7242 100644 (file)
@@ -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++;
        }
 }
This page took 0.047893 seconds and 5 git commands to generate.