Make riscv use THP contpte support for arm64

[bjoto]

Pull request for series with
subject: Make riscv use THP contpte support for arm64
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=851685

[bjoto]

Upstream branch: 6beb6bc
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=851685
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=851685
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: mm, arm64: Rename ARM64_CONTPTE to THP_CONTPTE
Using index info to reconstruct a base tree...
M	arch/arm64/Kconfig
M	arch/arm64/include/asm/pgtable.h
M	mm/Kconfig
Falling back to patching base and 3-way merge...
Auto-merging mm/Kconfig
CONFLICT (content): Merge conflict in mm/Kconfig
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging arch/arm64/Kconfig
Patch failed at 0001 mm, arm64: Rename ARM64_CONTPTE to THP_CONTPTE
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc mm/Kconfig
index b1448aa81e15,fd4de221a1c6..000000000000
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@@ -981,6 -981,18 +981,21 @@@ config ARCH_HAS_CPU_CACHE_ALIASIN
  config ARCH_HAS_CACHE_LINE_SIZE
  	bool
  
++<<<<<<< HEAD
++=======
+ config ARCH_HAS_CONTPTE
+ 	bool
+ 
+ config THP_CONTPTE
+ 	bool "Contiguous PTE mappings for user memory" if EXPERT
+ 	depends on ARCH_HAS_CONTPTE && TRANSPARENT_HUGEPAGE
+ 	default y
+ 	help
+ 	  When enabled, user mappings are configured using the PTE contiguous
+ 	  bit, for any mappings that meet the size and alignment requirements.
+ 	  This reduces TLB pressure and improves performance.
+ 
++>>>>>>> mm, arm64: Rename ARM64_CONTPTE to THP_CONTPTE
  config ARCH_HAS_CURRENT_STACK_POINTER
  	bool
  	help