Skip to content

Commit 6ca297d

Browse files
Peter Zijlstrahansendc
authored andcommitted
mm: Rename GUP_GET_PTE_LOW_HIGH
Since it no longer applies to only PTEs, rename it to PXX. Suggested-by: Linus Torvalds <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/20221022114424.776404066%40infradead.org
1 parent 024d232 commit 6ca297d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

arch/mips/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ config MIPS
4646
select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC
4747
select GENERIC_SMP_IDLE_THREAD
4848
select GENERIC_TIME_VSYSCALL
49-
select GUP_GET_PTE_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT
49+
select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT
5050
select HAVE_ARCH_COMPILER_H
5151
select HAVE_ARCH_JUMP_LABEL
5252
select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT

arch/sh/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ config SUPERH
2424
select GENERIC_PCI_IOMAP if PCI
2525
select GENERIC_SCHED_CLOCK
2626
select GENERIC_SMP_IDLE_THREAD
27-
select GUP_GET_PTE_LOW_HIGH if X2TLB
27+
select GUP_GET_PXX_LOW_HIGH if X2TLB
2828
select HAVE_ARCH_AUDITSYSCALL
2929
select HAVE_ARCH_KGDB
3030
select HAVE_ARCH_SECCOMP_FILTER

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ config X86
157157
select GENERIC_TIME_VSYSCALL
158158
select GENERIC_GETTIMEOFDAY
159159
select GENERIC_VDSO_TIME_NS
160-
select GUP_GET_PTE_LOW_HIGH if X86_PAE
160+
select GUP_GET_PXX_LOW_HIGH if X86_PAE
161161
select HARDIRQS_SW_RESEND
162162
select HARDLOCKUP_CHECK_TIMESTAMP if X86_64
163163
select HAVE_ACPI_APEI if ACPI

include/linux/pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static inline pmd_t pmdp_get(pmd_t *pmdp)
305305
}
306306
#endif
307307

308-
#ifdef CONFIG_GUP_GET_PTE_LOW_HIGH
308+
#ifdef CONFIG_GUP_GET_PXX_LOW_HIGH
309309
/*
310310
* For walking the pagetables without holding any locks. Some architectures
311311
* (eg x86-32 PAE) cannot load the entries atomically without using expensive
@@ -365,7 +365,7 @@ static inline pmd_t pmdp_get_lockless(pmd_t *pmdp)
365365
}
366366
#define pmdp_get_lockless pmdp_get_lockless
367367
#endif /* CONFIG_PGTABLE_LEVELS > 2 */
368-
#endif /* CONFIG_GUP_GET_PTE_LOW_HIGH */
368+
#endif /* CONFIG_GUP_GET_PXX_LOW_HIGH */
369369

370370
/*
371371
* We require that the PTE can be read atomically.

mm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ config GUP_TEST
10441044
comment "GUP_TEST needs to have DEBUG_FS enabled"
10451045
depends on !GUP_TEST && !DEBUG_FS
10461046

1047-
config GUP_GET_PTE_LOW_HIGH
1047+
config GUP_GET_PXX_LOW_HIGH
10481048
bool
10491049

10501050
config ARCH_HAS_PTE_SPECIAL

0 commit comments

Comments
 (0)