diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
| commit | bff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch) | |
| tree | de4ab64ec0837ae308e17312b553e9a5209b6f62 /arch/x86/include/asm/lguest.h | |
| parent | e7fad451f06e21e74b6051c5ad4917e37460be3a (diff) | |
| parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
| download | op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.zip op-kernel-dev-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/include/asm/lguest.h')
| -rw-r--r-- | arch/x86/include/asm/lguest.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/lguest.h b/arch/x86/include/asm/lguest.h index 1caf576..313389c 100644 --- a/arch/x86/include/asm/lguest.h +++ b/arch/x86/include/asm/lguest.h @@ -17,8 +17,13 @@ /* Pages for switcher itself, then two pages per cpu */ #define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids) -/* We map at -4M for ease of mapping into the guest (one PTE page). */ +/* We map at -4M (-2M when PAE is activated) for ease of mapping + * into the guest (one PTE page). */ +#ifdef CONFIG_X86_PAE +#define SWITCHER_ADDR 0xFFE00000 +#else #define SWITCHER_ADDR 0xFFC00000 +#endif /* Found in switcher.S */ extern unsigned long default_idt_entries[]; |
