diff options
| author |   Suresh Siddha <suresh.b.siddha@intel.com> | 2008-09-23 14:00:36 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-10-10 19:29:11 +0200 |
| commit | b2bc27314664c4d1a2f02e6f4cd0c32e4681d61e (patch) | |
| tree | 48bc6e1dc35b21f6c60817b1237229b29f8394ab /arch/x86/kernel/head_64.S | |
| parent | Merge commit 'v2.6.27-rc6' into x86/pat (diff) | |
| download | linux-dev-b2bc27314664c4d1a2f02e6f4cd0c32e4681d61e.tar.xz linux-dev-b2bc27314664c4d1a2f02e6f4cd0c32e4681d61e.zip | |
x86, cpa: rename PTE attribute macros for kernel direct mapping in early boot
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: arjan@linux.intel.com
Cc: venkatesh.pallipadi@intel.com
Cc: jeremy@goop.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/head_64.S')
| -rw-r--r-- | arch/x86/kernel/head_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index db3280afe886..26cfdc1d7c7f 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -110,7 +110,7 @@ startup_64: movq %rdi, %rax shrq $PMD_SHIFT, %rax andq $(PTRS_PER_PMD - 1), %rax - leaq __PAGE_KERNEL_LARGE_EXEC(%rdi), %rdx + leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx leaq level2_spare_pgt(%rip), %rbx movq %rdx, 0(%rbx, %rax, 8) ident_complete: @@ -374,7 +374,7 @@ NEXT_PAGE(level2_ident_pgt) /* Since I easily can, map the first 1G. * Don't set NX because code runs from these pages. */ - PMDS(0, __PAGE_KERNEL_LARGE_EXEC, PTRS_PER_PMD) + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD) NEXT_PAGE(level2_kernel_pgt) /* |