powerpc-mm-thread-pgprot_t-through-create_section_mapping.patch removed from -mm tree
The patch titled
Subject: powerpc/mm: thread pgprot_t through create_section_mapping()
has been removed from the -mm tree. Its filename was
powerpc-mm-thread-pgprot_t-through-create_section_mapping.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Logan Gunthorpe <[email protected]>
Subject: powerpc/mm: thread pgprot_t through create_section_mapping()
In prepartion to support a pgprot_t argument for arch_add_memory().
Signed-off-by Logan Gunthorpe <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Dan Williams <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Eric Badger <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/powerpc/include/asm/book3s/64/hash.h | 3 ++- arch/powerpc/include/asm/book3s/64/radix.h | 3 ++- arch/powerpc/include/asm/sparsemem.h | 3 ++- arch/powerpc/mm/book3s64/hash_utils.c | 5 +++-- arch/powerpc/mm/book3s64/pgtable.c | 7 ++++--- arch/powerpc/mm/book3s64/radix_pgtable.c | 18 +++++++++++------- arch/powerpc/mm/mem.c | 5 +++-- 7 files changed, 27 insertions(+), 17 deletions(-)
arch/powerpc/include/asm/book3s/64/hash.h renamed from arch/powerpc/include/asm/book3s/64/hash.h~powerpc-mm-thread-pgprot_t-through-create_section_mapping +2 -1
@@ -251,7 +251,8 @@ extern int __meminit hash__vmemmap_creatextern void hash__vmemmap_remove_mapping (unsigned long start,unsigned long page_size); -int hash__create_section_mapping (unsigned long start,unsigned long end,int nid); +int hash__create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot);int hash__remove_section_mapping (unsigned long start,unsigned long end);#endif /* !__ASSEMBLY__ */
arch/powerpc/include/asm/book3s/64/radix.h renamed from arch/powerpc/include/asm/book3s/64/radix.h~powerpc-mm-thread-pgprot_t-through-create_section_mapping +2 -1
@@ -294,7 +294,8 @@ static inline unsigned long radix__get_t }#ifdef CONFIG_MEMORY_HOTPLUG -int radix__create_section_mapping (unsigned long start,unsigned long end,int nid); +int radix__create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot);int radix__remove_section_mapping (unsigned long start,unsigned long end);#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* __ASSEMBLY__ */
arch/powerpc/include/asm/sparsemem.h renamed from arch/powerpc/include/asm/sparsemem.h~powerpc-mm-thread-pgprot_t-through-create_section_mapping +2 -1
@@ -13,7 +13,8 @@#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_MEMORY_HOTPLUG -extern int create_section_mapping (unsigned long start,unsigned long end,int nid); +extern int create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot);extern int remove_section_mapping (unsigned long start,unsigned long end);#ifdef CONFIG_PPC_BOOK3S_64
arch/powerpc/mm/book3s64/hash_utils.c renamed from arch/powerpc/mm/book3s64/hash_utils.c~powerpc-mm-thread-pgprot_t-through-create_section_mapping +3 -2
@@ -809,7 +809,8 @@ int resize_hpt_for_hotplug(unsigned longreturn 0 ; } -int hash__create_section_mapping (unsigned long start,unsigned long end,int nid) +int hash__create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot) {int rc;
@@ -819,7 +820,7 @@ int hash__create_section_mapping(unsigne } rc =htab_bolt_mapping (start, end,__pa (start), -pgprot_val (PAGE_KERNEL ), mmu_linear_psize, +pgprot_val (prot), mmu_linear_psize, mmu_kernel_ssize);if (rc <0 ) {
arch/powerpc/mm/book3s64/pgtable.c renamed from arch/powerpc/mm/book3s64/pgtable.c~powerpc-mm-thread-pgprot_t-through-create_section_mapping +4 -3
@@ -171,12 +171,13 @@ void mmu_cleanup_all(void) }#ifdef CONFIG_MEMORY_HOTPLUG -int __meminit create_section_mapping (unsigned long start,unsigned long end,int nid) +int __meminit create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot) {if (radix_enabled ()) -return radix__create_section_mapping (start, end, nid); +return radix__create_section_mapping (start, end, nid, prot); -return hash__create_section_mapping (start, end, nid); +return hash__create_section_mapping (start, end, nid, prot); }int __meminit remove_section_mapping (unsigned long start,unsigned long end)
arch/powerpc/mm/book3s64/radix_pgtable.c renamed from arch/powerpc/mm/book3s64/radix_pgtable.c~powerpc-mm-thread-pgprot_t-through-create_section_mapping +11 -7
@@ -254,7 +254,7 @@ static unsigned long next_boundary(unsigstatic int __meminit create_physical_mapping (unsigned long start,unsigned long end, -int nid) +int nid,pgprot_t _prot) {unsigned long vaddr, addr, mapping_size =0 ;bool prev_exec, exec = false;
@@ -290,7 +290,7 @@ static int __meminit create_physical_map prot =PAGE_KERNEL_X ; exec = true; }else { - prot =PAGE_KERNEL ; + prot = _prot; exec = false; }
@@ -334,7 +334,7 @@ static void __init radix_init_pgtable(voWARN_ON (create_physical_mapping (reg->base, reg->base + reg->size, --1 )); +-1 ,PAGE_KERNEL )); }/* Find out how many PID bits are supported */
@@ -713,8 +713,10 @@ static int __meminit stop_machine_changespin_unlock (&init_mm.page_table_lock);pte_clear (&init_mm, params->aligned_start, params->pte); -create_physical_mapping (__pa (params->aligned_start),__pa (params->start),-1 ); -create_physical_mapping (__pa (params->end),__pa (params->aligned_end),-1 ); +create_physical_mapping (__pa (params->aligned_start), +__pa (params->start),-1 ,PAGE_KERNEL ); +create_physical_mapping (__pa (params->end),__pa (params->aligned_end), +-1 ,PAGE_KERNEL );spin_lock (&init_mm.page_table_lock);return 0 ; }
@@ -871,14 +873,16 @@ static void __meminit remove_pagetable(uradix__flush_tlb_kernel_range (start, end); } -int __meminit radix__create_section_mapping (unsigned long start,unsigned long end,int nid) +int __meminit radix__create_section_mapping (unsigned long start, +unsigned long end,int nid, +pgprot_t prot) {if (end >=RADIX_VMALLOC_START ) {pr_warn ("Outside the supported range\n" );return -1 ; } -return create_physical_mapping (__pa (start),__pa (end), nid); +return create_physical_mapping (__pa (start),__pa (end), nid, prot); }int __meminit radix__remove_section_mapping (unsigned long start,unsigned long end)
arch/powerpc/mm/mem.c renamed from arch/powerpc/mm/mem.c~powerpc-mm-thread-pgprot_t-through-create_section_mapping +3 -2
@@ -90,7 +90,8 @@ int memory_add_physaddr_to_nid(u64 start }#endif -int __weak create_section_mapping (unsigned long start,unsigned long end,int nid) +int __weak create_section_mapping (unsigned long start,unsigned long end, +int nid,pgprot_t prot) {return -ENODEV ; }
@@ -131,7 +132,7 @@ int __ref arch_add_memory(int nid, u64 sresize_hpt_for_hotplug (memblock_phys_mem_size ()); start = (unsigned long )__va (start); - rc =create_section_mapping (start, start + size, nid); + rc =create_section_mapping (start, start + size, nid,PAGE_KERNEL );if (rc) {pr_warn ("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n" , start, start + size, rc);
_
Patches currently in -mm which might be from [email protected] are