diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 17:40:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 17:40:43 +0100 |
| commit | 3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch) | |
| tree | 2cd8a8d61f350aa3b00e6b0afc998544923f183e /arch/x86/mm | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) | |
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/pageattr.c | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index deb1c1ab786..64c9cf043cd 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -166,7 +166,7 @@ int __init compute_hash_shift(struct bootnode *nodes, int numnodes, return shift; } -int early_pfn_to_nid(unsigned long pfn) +int __meminit __early_pfn_to_nid(unsigned long pfn) { return phys_to_nid(pfn << PAGE_SHIFT); } diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 8ca0d8566fc..7be47d1a97e 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -508,18 +508,13 @@ static int split_large_page(pte_t *kpte, unsigned long address) #endif /* - * Install the new, split up pagetable. Important details here: + * Install the new, split up pagetable. * - * On Intel the NX bit of all levels must be cleared to make a - * page executable. See section 4.13.2 of Intel 64 and IA-32 - * Architectures Software Developer's Manual). - * - * Mark the entry present. The current mapping might be - * set to not present, which we preserved above. + * We use the standard kernel pagetable protections for the new + * pagetable protections, the actual ptes set above control the + * primary protection behavior: */ - ref_prot = pte_pgprot(pte_mkexec(pte_clrhuge(*kpte))); - pgprot_val(ref_prot) |= _PAGE_PRESENT; - __set_pmd_pte(kpte, address, mk_pte(base, ref_prot)); + __set_pmd_pte(kpte, address, mk_pte(base, __pgprot(_KERNPG_TABLE))); base = NULL; out_unlock: |