summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/lguest.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
commite8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch)
tree31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /arch/x86/include/asm/lguest.h
parentx86: properly annotate alternatives.c (diff)
parentx86: Fix build with older binutils and consolidate linker script (diff)
downloadlinux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.tar.xz
linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.zip
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'arch/x86/include/asm/lguest.h')
-rw-r--r--arch/x86/include/asm/lguest.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/lguest.h b/arch/x86/include/asm/lguest.h
index 94cd69858b14..0d97deba1e35 100644
--- a/arch/x86/include/asm/lguest.h
+++ b/arch/x86/include/asm/lguest.h
@@ -17,8 +17,7 @@
/* Pages for switcher itself, then two pages per cpu */
#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids)
-/* We map at -4M (-2M when PAE is activated) for ease of mapping
- * into the guest (one PTE page). */
+/* We map at -4M (-2M for PAE) for ease of mapping (one PTE page). */
#ifdef CONFIG_X86_PAE
#define SWITCHER_ADDR 0xFFE00000
#else