Commit 8548c84d authored Oct 23, 2011 by Takashi Iwai Committed by Linus Torvalds Oct 24, 2011

x86: Fix S4 regression



Commit 4b239f45 ("x86-64, mm: Put early page table high") causes a S4
regression since 2.6.39, namely the machine reboots occasionally at S4
resume.  It doesn't happen always, overall rate is about 1/20.  But,
like other bugs, once when this happens, it continues to happen.

This patch fixes the problem by essentially reverting the memory
assignment in the older way.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Yinghai Lu <yinghai.lu@oracle.com>
[ We'll hopefully find the real fix, but that's too late for 3.1 now ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 1bf1aace

arch/x86/mm/init.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -63,9 +63,8 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
		#ifdef CONFIG_X86_32
		/* for fixmap */
		tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);

		good_end = max_pfn_mapped << PAGE_SHIFT;
		#endif
		good_end = max_pfn_mapped << PAGE_SHIFT;

		base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
		if (base == MEMBLOCK_ERROR)