ebtables: fix compilation with GCC14

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch

diff --git a/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch b/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
index 60ce9c07cc015b7944826ca53597d8d0518e7ce0..8e4de36db07c6fce1df4dc2f8e7688bf685c4948 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
+++ b/target/linux/generic/backport-5.15/020-v6.1-02-mm-x86-add-CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG.patch
@@ -71,11 +71,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  include/linux/pgtable.h        | 4 ++--
  5 files changed, 17 insertions(+), 4 deletions(-)
 
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 5987363b41c2..62d55b7ccca1 100644
 --- a/arch/Kconfig
 +++ b/arch/Kconfig
-@@ -1295,6 +1295,14 @@ config ARCH_HAS_ELFCORE_COMPAT
+@@ -1307,6 +1307,14 @@ config ARCH_HAS_ELFCORE_COMPAT
  config ARCH_HAS_PARANOID_L1D_FLUSH
        bool
  
@@ -90,11 +88,9 @@ index 5987363b41c2..62d55b7ccca1 100644
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index a08ce6360382..38e1d231d52a 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -84,6 +84,7 @@ config X86
+@@ -86,6 +86,7 @@ config X86
        select ARCH_HAS_PMEM_API                if X86_64
        select ARCH_HAS_PTE_DEVMAP              if X86_64
        select ARCH_HAS_PTE_SPECIAL
@@ -102,11 +98,9 @@ index a08ce6360382..38e1d231d52a 100644
        select ARCH_HAS_UACCESS_FLUSHCACHE      if X86_64
        select ARCH_HAS_COPY_MC                 if X86_64
        select ARCH_HAS_SET_MEMORY
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 3908780fc408..01a1763123ff 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -817,7 +817,8 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)
+@@ -817,7 +817,8 @@ static inline unsigned long pmd_page_vad
  
  static inline int pmd_bad(pmd_t pmd)
  {
@@ -116,11 +110,9 @@ index 3908780fc408..01a1763123ff 100644
  }
  
  static inline unsigned long pages_to_mb(unsigned long npg)
-diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index 3481b35cb4ec..a224193d84bf 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
-@@ -550,7 +550,7 @@ int ptep_test_and_clear_young(struct vm_area_struct *vma,
+@@ -550,7 +550,7 @@ int ptep_test_and_clear_young(struct vm_
        return ret;
  }
  
@@ -129,7 +121,7 @@ index 3481b35cb4ec..a224193d84bf 100644
  int pmdp_test_and_clear_young(struct vm_area_struct *vma,
                              unsigned long addr, pmd_t *pmdp)
  {
-@@ -562,6 +562,9 @@ int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+@@ -562,6 +562,9 @@ int pmdp_test_and_clear_young(struct vm_
  
        return ret;
  }
@@ -139,11 +131,9 @@ index 3481b35cb4ec..a224193d84bf 100644
  int pudp_test_and_clear_young(struct vm_area_struct *vma,
                              unsigned long addr, pud_t *pudp)
  {
-diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
-index 2f1188980baf..e6889556e0bf 100644
 --- a/include/linux/pgtable.h
 +++ b/include/linux/pgtable.h
-@@ -212,7 +212,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
+@@ -212,7 +212,7 @@ static inline int ptep_test_and_clear_yo
  #endif
  
  #ifndef __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG
@@ -152,7 +142,7 @@ index 2f1188980baf..e6889556e0bf 100644
  static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
                                            unsigned long address,
                                            pmd_t *pmdp)
-@@ -233,7 +233,7 @@ static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
+@@ -233,7 +233,7 @@ static inline int pmdp_test_and_clear_yo
        BUILD_BUG();
        return 0;
  }
@@ -161,6 +151,3 @@ index 2f1188980baf..e6889556e0bf 100644
  #endif
  
  #ifndef __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
--- 
-2.40.0
-