diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-10 06:29:47 +0200 |
commit | f222e8b40f2177b1c4cac015b117744c1d3fa3e9 (patch) | |
tree | 7c5fc22c08da900e21b0e7ab2376e8e8e44a63c0 /arch/x86/include/asm/lguest.h | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff) | |
download | linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.tar.xz linux-f222e8b40f2177b1c4cac015b117744c1d3fa3e9.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/x86/include/asm/lguest.h')
-rw-r--r-- | arch/x86/include/asm/lguest.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/lguest.h b/arch/x86/include/asm/lguest.h index 313389cd50d2..5136dad57cbb 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 |