x86: Fix S4 regression
authorTakashi Iwai <[email protected]>
Sun, 23 Oct 2011 21:19:12 +0000 (23:19 +0200)
committerLinus Torvalds <[email protected]>
Mon, 24 Oct 2011 04:55:20 +0000 (06:55 +0200)
commit8548c84da2f47e71bbbe300f55edb768492575f7
treedee4aead0c592f64829bb1211c463ad86cce0dfe
parent1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49
x86: Fix S4 regression

Commit 4b239f458 ("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 <[email protected]>
Cc: <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Yinghai Lu <[email protected]>
[ We'll hopefully find the real fix, but that's too late for 3.1 now ]
Signed-off-by: Linus Torvalds <[email protected]>
arch/x86/mm/init.c