lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'origin/x86/urgent' into x86/asm

Browse Source
This commit is contained in:
H. Peter Anvin
2009-08-25 15:40:29 -07:00
parent 8b5a10fc6f c62e43202e
commit e8a2eb47e6
1119 changed files with 33360 additions and 16906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/lguest.h
View File

@@ -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