Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce835e51 authored by Tkhai Kirill's avatar Tkhai Kirill Committed by David S. Miller
Browse files

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: default avatarKirill Tkhai <tkhai@yandex.ru>
CC: David Miller <davem@davemloft.net>
CC: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdde6b3c

arch/sparc/mm/init_64.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -2125,7 +2125,6 @@ void free_initmem(void) 
			ClearPageReserved(p);

			ClearPageReserved(p);

			init_page_count(p);

			init_page_count(p);

			__free_page(p);

			__free_page(p);

			num_physpages++;

			totalram_pages++;

			totalram_pages++;

		}

		}

	}

	}
@@ -2142,7 +2141,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
		ClearPageReserved(p);

		ClearPageReserved(p);

		init_page_count(p);

		init_page_count(p);

		__free_page(p);

		__free_page(p);

		num_physpages++;

		totalram_pages++;

		totalram_pages++;

	}

	}

}

}