x86/mm: thread pgprot_t through init_memory_mapping()

[linux-2.6-microblaze.git] / arch / x86 / mm / init_64.c

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index faa86a9..7480de7 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -585,7 +585,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end,
  */
 static unsigned long __meminit
 phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
-             unsigned long page_size_mask, bool init)
+             unsigned long page_size_mask, pgprot_t _prot, bool init)
 {
        unsigned long pages = 0, paddr_next;
        unsigned long paddr_last = paddr_end;
@@ -595,7 +595,7 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
        for (; i < PTRS_PER_PUD; i++, paddr = paddr_next) {
                pud_t *pud;
                pmd_t *pmd;
-               pgprot_t prot = PAGE_KERNEL;
+               pgprot_t prot = _prot;
 
                vaddr = (unsigned long)__va(paddr);
                pud = pud_page + pud_index(vaddr);
@@ -644,9 +644,12 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
                if (page_size_mask & (1<<PG_LEVEL_1G)) {
                        pages++;
                        spin_lock(&init_mm.page_table_lock);
+
+                       prot = __pgprot(pgprot_val(prot) | __PAGE_KERNEL_LARGE);
+
                        set_pte_init((pte_t *)pud,
                                     pfn_pte((paddr & PUD_MASK) >> PAGE_SHIFT,
-                                            PAGE_KERNEL_LARGE),
+                                            prot),
                                     init);
                        spin_unlock(&init_mm.page_table_lock);
                        paddr_last = paddr_next;
@@ -669,7 +672,7 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
 
 static unsigned long __meminit
 phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end,
-             unsigned long page_size_mask, bool init)
+             unsigned long page_size_mask, pgprot_t prot, bool init)
 {
        unsigned long vaddr, vaddr_end, vaddr_next, paddr_next, paddr_last;
 
@@ -679,7 +682,7 @@ phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end,
 
        if (!pgtable_l5_enabled())
                return phys_pud_init((pud_t *) p4d_page, paddr, paddr_end,
-                                    page_size_mask, init);
+                                    page_size_mask, prot, init);
 
        for (; vaddr < vaddr_end; vaddr = vaddr_next) {
                p4d_t *p4d = p4d_page + p4d_index(vaddr);
@@ -702,13 +705,13 @@ phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end,
                if (!p4d_none(*p4d)) {
                        pud = pud_offset(p4d, 0);
                        paddr_last = phys_pud_init(pud, paddr, __pa(vaddr_end),
-                                       page_size_mask, init);
+                                       page_size_mask, prot, init);
                        continue;
                }
 
                pud = alloc_low_page();
                paddr_last = phys_pud_init(pud, paddr, __pa(vaddr_end),
-                                          page_size_mask, init);
+                                          page_size_mask, prot, init);
 
                spin_lock(&init_mm.page_table_lock);
                p4d_populate_init(&init_mm, p4d, pud, init);
@@ -722,7 +725,7 @@ static unsigned long __meminit
 __kernel_physical_mapping_init(unsigned long paddr_start,
                               unsigned long paddr_end,
                               unsigned long page_size_mask,
-                              bool init)
+                              pgprot_t prot, bool init)
 {
        bool pgd_changed = false;
        unsigned long vaddr, vaddr_start, vaddr_end, vaddr_next, paddr_last;
@@ -743,13 +746,13 @@ __kernel_physical_mapping_init(unsigned long paddr_start,
                        paddr_last = phys_p4d_init(p4d, __pa(vaddr),
                                                   __pa(vaddr_end),
                                                   page_size_mask,
-                                                  init);
+                                                  prot, init);
                        continue;
                }
 
                p4d = alloc_low_page();
                paddr_last = phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end),
-                                          page_size_mask, init);
+                                          page_size_mask, prot, init);
 
                spin_lock(&init_mm.page_table_lock);
                if (pgtable_l5_enabled())
@@ -778,10 +781,10 @@ __kernel_physical_mapping_init(unsigned long paddr_start,
 unsigned long __meminit
 kernel_physical_mapping_init(unsigned long paddr_start,
                             unsigned long paddr_end,
-                            unsigned long page_size_mask)
+                            unsigned long page_size_mask, pgprot_t prot)
 {
        return __kernel_physical_mapping_init(paddr_start, paddr_end,
-                                             page_size_mask, true);
+                                             page_size_mask, prot, true);
 }
 
 /*
@@ -796,7 +799,8 @@ kernel_physical_mapping_change(unsigned long paddr_start,
                               unsigned long page_size_mask)
 {
        return __kernel_physical_mapping_init(paddr_start, paddr_end,
-                                             page_size_mask, false);
+                                             page_size_mask, PAGE_KERNEL,
+                                             false);
 }
 
 #ifndef CONFIG_NUMA
@@ -863,7 +867,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
 
-       init_memory_mapping(start, start + size);
+       init_memory_mapping(start, start + size, PAGE_KERNEL);
 
        return add_pages(nid, start_pfn, nr_pages, params);
 }