diff mbox series

[v4,31/36] mm: Tidy up set_ptes definition

Message ID	20230315051444.3229621-32-willy@infradead.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 31/36] mm: Tidy up set_ptes definition Date: Wed, 15 Mar 2023 05:14:39 +0000 Message-Id: <20230315051444.3229621-32-willy@infradead.org> In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	New page table range API \| [v4,00/36] New page table range API [v4,01/36] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() [v4,02/36] mm: Add generic flush_icache_pages() and documentation [v4,03/36] mm: Add folio_flush_mapping() [v4,04/36] mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO [v4,05/36] mm: Add default definition of set_ptes() [v4,06/36] alpha: Implement the new page table range API [v4,07/36] arc: Implement the new page table range API [v4,08/36] arm: Implement the new page table range API [v4,09/36] arm64: Implement the new page table range API [v4,10/36] csky: Implement the new page table range API [v4,11/36] hexagon: Implement the new page table range API [v4,12/36] ia64: Implement the new page table range API [v4,13/36] loongarch: Implement the new page table range API [v4,14/36] m68k: Implement the new page table range API [v4,15/36] microblaze: Implement the new page table range API [v4,16/36] mips: Implement the new page table range API [v4,17/36] nios2: Implement the new page table range API [v4,18/36] openrisc: Implement the new page table range API [v4,19/36] parisc: Implement the new page table range API [v4,20/36] powerpc: Implement the new page table range API [v4,21/36] riscv: Implement the new page table range API [v4,22/36] s390: Implement the new page table range API [v4,23/36] superh: Implement the new page table range API [v4,24/36] sparc32: Implement the new page table range API [v4,25/36] sparc64: Implement the new page table range API [v4,26/36] um: Implement the new page table range API [v4,27/36] x86: Implement the new page table range API [v4,28/36] xtensa: Implement the new page table range API [v4,29/36] mm: Remove page_mapping_file() [v4,30/36] mm: Rationalise flush_icache_pages() and flush_icache_page() [v4,31/36] mm: Tidy up set_ptes definition [v4,32/36] mm: Use flush_icache_pages() in do_set_pmd() [v4,33/36] filemap: Add filemap_map_folio_range() [v4,34/36] rmap: add folio_add_file_rmap_range() [v4,35/36] mm: Convert do_set_pte() to set_pte_range() [v4,36/36] filemap: Batch PTE mappings

Commit Message

Matthew Wilcox March 15, 2023, 5:14 a.m. UTC

  Now that all architectures are converted, we can remove the
PFN_PTE_SHIFT ifdef and we can define set_pte_at() unconditionally.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/linux/pgtable.h | 6 ------
 1 file changed, 6 deletions(-)

Comments

Anshuman Khandual May 25, 2023, 6:20 a.m. UTC | #1

On 3/15/23 10:44, Matthew Wilcox (Oracle) wrote:
> Now that all architectures are converted, we can remove the
> PFN_PTE_SHIFT ifdef and we can define set_pte_at() unconditionally.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>

> ---
>  include/linux/pgtable.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
> index a755fe94b4b4..a54b9197f2f2 100644
> --- a/include/linux/pgtable.h
> +++ b/include/linux/pgtable.h
> @@ -173,7 +173,6 @@ static inline int pmd_young(pmd_t pmd)
>  #endif
>  
>  #ifndef set_ptes
> -#ifdef PFN_PTE_SHIFT
>  /**
>   * set_ptes - Map consecutive pages to a contiguous range of addresses.
>   * @mm: Address space to map the pages into.
> @@ -201,13 +200,8 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
>  		pte = __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT));
>  	}
>  }
> -#ifndef set_pte_at
> -#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
> -#endif
>  #endif
> -#else
>  #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
> -#endif
>  
>  #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
>  extern int ptep_set_access_flags(struct vm_area_struct *vma,

diff mbox series

Patch

diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index a755fe94b4b4..a54b9197f2f2 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -173,7 +173,6 @@  static inline int pmd_young(pmd_t pmd)
 #endif
 
 #ifndef set_ptes
-#ifdef PFN_PTE_SHIFT
 /**
  * set_ptes - Map consecutive pages to a contiguous range of addresses.
  * @mm: Address space to map the pages into.
@@ -201,13 +200,8 @@  static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
 		pte = __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT));
 	}
 }
-#ifndef set_pte_at
-#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
-#endif
 #endif
-#else
 #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
-#endif
 
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 extern int ptep_set_access_flags(struct vm_area_struct *vma,