summaryrefslogtreecommitdiff
path: root/arch/x86/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2008-11-13 01:22:35 +0300
committerIngo Molnar <mingo@elte.hu>2008-11-13 01:28:51 +0300
commit97a70e548bd97d5a46ae9d44f24aafcc013fd701 (patch)
treed6374f548e88c41d212cef1494cf347f514e4cf3 /arch/x86/power
parent3edac25f2e8ac8c2a84904c140e1aeb434e73e75 (diff)
downloadlinux-97a70e548bd97d5a46ae9d44f24aafcc013fd701.tar.xz
x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
Impact: fix crash during hibernation on 32-bit NUMA The NUMA code on x86_32 creates special memory mapping that allows each node's pgdat to be located in this node's memory. For this purpose it allocates a memory area at the end of each node's memory and maps this area so that it is accessible with virtual addresses belonging to low memory. As a result, if there is high memory, these NUMA-allocated areas are physically located in high memory, although they are mapped to low memory addresses. Our hibernation code does not take that into account and for this reason hibernation fails on all x86_32 systems with CONFIG_NUMA=y and with high memory present. Fix this by adding a special mapping for the NUMA-allocated memory areas to the temporary page tables created during the last phase of resume. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/power')
-rw-r--r--arch/x86/power/hibernate_32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index f2b6e3f11bfc..81197c62d5b3 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -12,6 +12,7 @@
#include <asm/system.h>
#include <asm/page.h>
#include <asm/pgtable.h>
+#include <asm/mmzone.h>
/* Defined in hibernate_asm_32.S */
extern int restore_image(void);
@@ -127,6 +128,9 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
}
}
}
+
+ resume_map_numa_kva(pgd_base);
+
return 0;
}