Skip to content

Commit e30af85

Browse files
author
Fox Snowpatch
committed
From patchwork series 437051
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=437051
1 parent 2dd0957 commit e30af85

File tree

11 files changed

+9
-17
lines changed

11 files changed

+9
-17
lines changed

‎Documentation/arch/arm64/ptdump.rst

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ offlining of memory being accessed by the ptdump code.
2222
In order to dump the kernel page tables, enable the following
2323
configurations and mount debugfs::
2424

25-
CONFIG_GENERIC_PTDUMP=y
2625
CONFIG_PTDUMP_CORE=y
2726
CONFIG_PTDUMP_DEBUGFS=y
2827

‎arch/arm64/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ config ARM64
154154
select GENERIC_IRQ_SHOW_LEVEL
155155
select GENERIC_LIB_DEVMEM_IS_ALLOWED
156156
select GENERIC_PCI_IOMAP
157-
select GENERIC_PTDUMP
157+
select PTDUMP_CORE
158158
select GENERIC_SCHED_CLOCK
159159
select GENERIC_SMP_IDLE_THREAD
160160
select GENERIC_TIME_VSYSCALL

‎arch/arm64/kvm/Kconfig

+1-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ config PTDUMP_STAGE2_DEBUGFS
7171
depends on KVM
7272
depends on DEBUG_KERNEL
7373
depends on DEBUG_FS
74-
depends on GENERIC_PTDUMP
75-
select PTDUMP_CORE
74+
depends on PTDUMP_CORE
7675
default n
7776
help
7877
Say Y here if you want to show the stage-2 kernel pagetables

‎arch/powerpc/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ config PPC
203203
select GENERIC_IRQ_SHOW
204204
select GENERIC_IRQ_SHOW_LEVEL
205205
select GENERIC_PCI_IOMAP if PCI
206-
select GENERIC_PTDUMP
206+
select PTDUMP_CORE
207207
select GENERIC_SMP_IDLE_THREAD
208208
select GENERIC_TIME_VSYSCALL
209209
select GENERIC_VDSO_TIME_NS

‎arch/powerpc/configs/mpc885_ads_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ CONFIG_DEBUG_VM_PGTABLE=y
7878
CONFIG_DETECT_HUNG_TASK=y
7979
CONFIG_BDI_SWITCH=y
8080
CONFIG_PPC_EARLY_DEBUG=y
81-
CONFIG_GENERIC_PTDUMP=y

‎arch/riscv/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ config RISCV
111111
select GENERIC_IRQ_SHOW_LEVEL
112112
select GENERIC_LIB_DEVMEM_IS_ALLOWED
113113
select GENERIC_PCI_IOMAP
114-
select GENERIC_PTDUMP if MMU
114+
select PTDUMP_CORE if MMU
115115
select GENERIC_SCHED_CLOCK
116116
select GENERIC_SMP_IDLE_THREAD
117117
select GENERIC_TIME_VSYSCALL if MMU && 64BIT

‎arch/s390/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ config S390
155155
select GENERIC_CPU_VULNERABILITIES
156156
select GENERIC_ENTRY
157157
select GENERIC_GETTIMEOFDAY
158-
select GENERIC_PTDUMP
158+
select PTDUMP_CORE
159159
select GENERIC_SMP_IDLE_THREAD
160160
select GENERIC_TIME_VSYSCALL
161161
select GENERIC_VDSO_TIME_NS

‎arch/x86/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ config X86
173173
select GENERIC_IRQ_RESERVATION_MODE
174174
select GENERIC_IRQ_SHOW
175175
select GENERIC_PENDING_IRQ if SMP
176-
select GENERIC_PTDUMP
176+
select PTDUMP_CORE
177177
select GENERIC_SMP_IDLE_THREAD
178178
select GENERIC_TIME_VSYSCALL
179179
select GENERIC_GETTIMEOFDAY

‎arch/x86/Kconfig.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ config EARLY_PRINTK_USB_XDBC
5959
config EFI_PGT_DUMP
6060
bool "Dump the EFI pagetable"
6161
depends on EFI
62-
select PTDUMP_CORE
62+
depends on PTDUMP_CORE
6363
help
6464
Enable this if you want to dump the EFI page table before
6565
enabling virtual mode. This can be used to debug miscellaneous

‎kernel/configs/debug.config

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ CONFIG_DEBUG_VM=y
7373
CONFIG_DEBUG_VM_PGFLAGS=y
7474
CONFIG_DEBUG_VM_RB=y
7575
CONFIG_DEBUG_VM_VMACACHE=y
76-
CONFIG_GENERIC_PTDUMP=y
7776
CONFIG_KASAN=y
7877
CONFIG_KASAN_GENERIC=y
7978
CONFIG_KASAN_INLINE=y

‎mm/Kconfig.debug

+2-6
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ config DEBUG_WX
187187
bool "Warn on W+X mappings at boot"
188188
depends on ARCH_HAS_DEBUG_WX
189189
depends on MMU
190-
select PTDUMP_CORE
190+
depends on PTDUMP_CORE
191191
help
192192
Generate a warning if any W+X mappings are found at boot.
193193

@@ -212,18 +212,14 @@ config DEBUG_WX
212212

213213
If in doubt, say "Y".
214214

215-
config GENERIC_PTDUMP
216-
bool
217-
218215
config PTDUMP_CORE
219216
bool
220217

221218
config PTDUMP_DEBUGFS
222219
bool "Export kernel pagetable layout to userspace via debugfs"
223220
depends on DEBUG_KERNEL
224221
depends on DEBUG_FS
225-
depends on GENERIC_PTDUMP
226-
select PTDUMP_CORE
222+
depends on PTDUMP_CORE
227223
help
228224
Say Y here if you want to show the kernel pagetable layout in a
229225
debugfs file. This information is only useful for kernel developers

0 commit comments

Comments
 (0)