From 3c04d0635d09c1e1d482433c963c29c2dab73a4b Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 4 Feb 2008 16:48:09 +0100 Subject: [PATCH] --- yaml --- r: 82903 b: refs/heads/master c: d4f71f7969ee2c16e2969185280c13d4f51a9172 h: refs/heads/master i: 82901: b36f84b10036164ee8bfd7a3d23599a329a4fb34 82899: 0f6ff43f08eaadd5c5e399ef2feaafe68224fe65 82895: 9a2d72365eca6123f780dd4f566d28ed8c1dccc6 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 280f32bbfa20..f37a24a84b1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bfb72e847c201fe32271fb13f75d060671d8890 +refs/heads/master: d4f71f7969ee2c16e2969185280c13d4f51a9172 diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index 5855449ce7aa..3a98d6f724ab 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -273,7 +273,6 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) int i = pmd_index(address); for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { - unsigned long entry; pmd_t *pmd = pmd_page + pmd_index(address); if (address >= end) { @@ -287,9 +286,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) if (pmd_val(*pmd)) continue; - entry = __PAGE_KERNEL_LARGE|_PAGE_GLOBAL|address; - entry &= __supported_pte_mask; - set_pmd(pmd, __pmd(entry)); + set_pte((pte_t *)pmd, + pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); } }