aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-04-22 00:40:42 -0400
committerRusty Russell <rusty@rustcorp.com.au>2013-04-22 02:15:03 -0400
commit6b39271746de131366a14bcf04f5740cdc4abdef (patch)
treea2f8875e7186df5a801345a61b01b9b2eab9bbca /arch/x86
parent6d0cda93c0d3c8bb0a553047c10f114c88c8af89 (diff)
lguest: map Switcher below fixmap.
Now we've adjusted all the code, we can simply set switcher_addr to wherever it needs to go below the fixmaps, rather than asserting that it should be so. With large NR_CPUS and PAE, people were hitting the "mapping switcher would thwack fixmap" message. Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/lguest.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/lguest.h b/arch/x86/include/asm/lguest.h
index 74edebd010ab..e2d4a4afa8c3 100644
--- a/arch/x86/include/asm/lguest.h
+++ b/arch/x86/include/asm/lguest.h
@@ -14,12 +14,6 @@
14/* Page for Switcher text itself, then two pages per cpu */ 14/* Page for Switcher text itself, then two pages per cpu */
15#define TOTAL_SWITCHER_PAGES (1 + 2 * nr_cpu_ids) 15#define TOTAL_SWITCHER_PAGES (1 + 2 * nr_cpu_ids)
16 16
17/* We map at -4M (-2M for PAE) for ease of mapping (one PTE page). */
18#ifdef CONFIG_X86_PAE
19#define SWITCHER_ADDR 0xFFE00000
20#else
21#define SWITCHER_ADDR 0xFFC00000
22#endif
23/* Where we map the Switcher, in both Host and Guest. */ 17/* Where we map the Switcher, in both Host and Guest. */
24extern unsigned long switcher_addr; 18extern unsigned long switcher_addr;
25 19