powerpc: rename powerpc_debugfs_root to arch_debugfs_dir
Subsystems (4)
PATCH 1/1 powerpc: rename powerpc_debugfs_root to arch_debugfs_dir
No functional change in this patch. arch_debugfs_dir is the generic kernel name declared in linux/debugfs.h for arch-specific debugfs directory. Architectures like x86/s390 already use the name. Rename powerpc specific powerpc_debugfs_root to arch_debugfs_dir.
Signed-off-by Aneesh Kumar K.V <[email protected]>
--- arch/powerpc/include/asm/debugfs.h | 13 ------------- arch/powerpc/kernel/Makefile | 3 ++- arch/powerpc/kernel/dawr.c | 3 +-- arch/powerpc/kernel/eeh.c | 16 ++++++++-------- arch/powerpc/kernel/eeh_cache.c | 4 ++-- arch/powerpc/kernel/fadump.c | 4 ++-- arch/powerpc/kernel/hw_breakpoint.c | 1 - arch/powerpc/kernel/kdebugfs.c | 14 ++++++++++++++ arch/powerpc/kernel/security.c | 16 ++++++++-------- arch/powerpc/kernel/setup-common.c | 13 ------------- arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/kernel/traps.c | 4 ++-- arch/powerpc/kvm/book3s_xics.c | 6 +++--- arch/powerpc/kvm/book3s_xive.c | 3 +-- arch/powerpc/kvm/book3s_xive_native.c | 3 +-- arch/powerpc/mm/book3s64/hash_utils.c | 4 ++-- arch/powerpc/mm/book3s64/pgtable.c | 4 ++-- arch/powerpc/mm/book3s64/radix_tlb.c | 4 ++-- arch/powerpc/mm/ptdump/bats.c | 4 ++-- arch/powerpc/mm/ptdump/segment_regs.c | 4 ++-- arch/powerpc/platforms/cell/axon_msi.c | 4 ++-- arch/powerpc/platforms/powernv/memtrace.c | 3 +-- arch/powerpc/platforms/powernv/opal-imc.c | 4 ++-- arch/powerpc/platforms/powernv/opal-lpc.c | 4 ++-- arch/powerpc/platforms/powernv/opal-xscom.c | 4 ++-- arch/powerpc/platforms/powernv/pci-ioda.c | 4 ++-- arch/powerpc/platforms/pseries/dtl.c | 4 ++-- arch/powerpc/platforms/pseries/lpar.c | 5 +++-- arch/powerpc/sysdev/xive/common.c | 3 +-- arch/powerpc/xmon/xmon.c | 6 +++--- 30 files changed, 74 insertions(+), 91 deletions(-) delete mode 100644 arch/powerpc/include/asm/debugfs.h create mode 100644 arch/powerpc/kernel/kdebugfs.c
arch/powerpc/include/asm/debugfs.h deleted +0 -13
@@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _ASM_POWERPC_DEBUGFS_H -#define _ASM_POWERPC_DEBUGFS_H - -/* -* Copyright 2017, Michael Ellerman, IBM Corporation. -*/ - -#include <linux/debugfs.h> - -extern struct dentry *powerpc_debugfs_root; - -#endif /* _ASM_POWERPC_DEBUGFS_H */
arch/powerpc/kernel/Makefile +2 -1
@@ -46,7 +46,8 @@ obj-y := cputable.o syscalls.o \ prom.o traps.o setup-common.o \ udbg.o misc.o io.o misc_$(BITS).o \ of_platform.o prom_parse.o firmware.o \ - hw_breakpoint_constraints.o interrupt.o + hw_breakpoint_constraints.o interrupt.o \ + kdebugfs.o obj-y += ptrace/ obj-$(CONFIG_PPC64) += setup_64.o \ paca.o nvram_64.o note.o
arch/powerpc/kernel/dawr.c +1 -2
@@ -9,7 +9,6 @@#include <linux/export.h> #include <linux/fs.h> #include <linux/debugfs.h> -#include <asm/debugfs.h> #include <asm/machdep.h> #include <asm/hvcall.h>
@@ -101,7 +100,7 @@ static int __init dawr_force_setup(void)if (PVR_VER (mfspr (SPRN_PVR )) ==PVR_POWER9 ) {/* Turn DAWR off by default, but allow admin to turn it on */ debugfs_create_file_unsafe ("dawr_enable_dangerous" ,0600 , - powerpc_debugfs_root, + arch_debugfs_dir, &dawr_force_enable, &dawr_enable_fops); }
arch/powerpc/kernel/eeh.c +8 -8
@@ -21,9 +21,9 @@#include <linux/spinlock.h> #include <linux/export.h> #include <linux/of.h> +#include <linux/debugfs.h> #include <linux/atomic.h> -#include <asm/debugfs.h> #include <asm/eeh.h> #include <asm/eeh_event.h> #include <asm/io.h>
@@ -1901,24 +1901,24 @@ static int __init eeh_init_proc(void)proc_create_single ("powerpc/eeh" ,0 ,NULL , proc_eeh_show);#ifdef CONFIG_DEBUG_FS debugfs_create_file_unsafe ("eeh_enable" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_enable_dbgfs_ops);debugfs_create_u32 ("eeh_max_freezes" ,0600 , - powerpc_debugfs_root, &eeh_max_freezes); + arch_debugfs_dir, &eeh_max_freezes);debugfs_create_bool ("eeh_disable_recovery" ,0600 , - powerpc_debugfs_root, + arch_debugfs_dir, &eeh_debugfs_no_recover);debugfs_create_file_unsafe ("eeh_dev_check" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_dev_check_fops);debugfs_create_file_unsafe ("eeh_dev_break" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_dev_break_fops);debugfs_create_file_unsafe ("eeh_force_recover" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_force_recover_fops);debugfs_create_file_unsafe ("eeh_dev_can_recover" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_dev_can_recover_fops);eeh_cache_debugfs_init ();#endif
arch/powerpc/kernel/eeh_cache.c +2 -2
@@ -12,8 +12,8 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/atomic.h> +#include <linux/debugfs.h> #include <asm/pci-bridge.h> -#include <asm/debugfs.h> #include <asm/ppc-pci.h>
@@ -283,6 +283,6 @@ DEFINE_SHOW_ATTRIBUTE(eeh_addr_cache);void eeh_cache_debugfs_init (void ) {debugfs_create_file_unsafe ("eeh_address_cache" ,0400 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &eeh_addr_cache_fops); }
arch/powerpc/kernel/fadump.c +2 -2
@@ -24,8 +24,8 @@#include <linux/slab.h> #include <linux/cma.h> #include <linux/hugetlb.h> +#include <linux/debugfs.h> -#include <asm/debugfs.h> #include <asm/page.h> #include <asm/prom.h> #include <asm/fadump.h>
@@ -1557,7 +1557,7 @@ static void fadump_init_files(void)return ; } -debugfs_create_file ("fadump_region" ,0444 , powerpc_debugfs_root,NULL , +debugfs_create_file ("fadump_region" ,0444 , arch_debugfs_dir,NULL , &fadump_region_fops);if (fw_dump.dump_active) {
arch/powerpc/kernel/hw_breakpoint.c +0 -1
@@ -22,7 +22,6 @@#include <asm/processor.h> #include <asm/sstep.h> #include <asm/debug.h> -#include <asm/debugfs.h> #include <asm/hvcall.h> #include <asm/inst.h> #include <linux/uaccess.h>
arch/powerpc/kernel/kdebugfs.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/debugfs.h> +#include <linux/export.h> +#include <linux/init.h> + +struct dentry *arch_debugfs_dir; +EXPORT_SYMBOL (arch_debugfs_dir); + +static int __init arch_kdebugfs_init (void ) +{ + arch_debugfs_dir =debugfs_create_dir ("powerpc" ,NULL ); +return 0 ; +} +arch_initcall (arch_kdebugfs_init);
arch/powerpc/kernel/security.c +8 -8
@@ -11,10 +11,10 @@#include <linux/nospec.h> #include <linux/prctl.h> #include <linux/seq_buf.h> +#include <linux/debugfs.h> #include <asm/asm-prototypes.h> #include <asm/code-patching.h> -#include <asm/debugfs.h> #include <asm/security_features.h> #include <asm/setup.h> #include <asm/inst.h>
@@ -106,7 +106,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_barrier_nospec, barrier_nospec_get,static __init int barrier_nospec_debugfs_init (void ) {debugfs_create_file_unsafe ("barrier_nospec" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &fops_barrier_nospec);return 0 ; }
@@ -114,7 +114,7 @@ device_initcall(barrier_nospec_debugfs_init);static __init int security_feature_debugfs_init (void ) { -debugfs_create_x64 ("security_features" ,0400 , powerpc_debugfs_root, +debugfs_create_x64 ("security_features" ,0400 , arch_debugfs_dir, &powerpc_security_features);return 0 ; }
@@ -420,7 +420,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_stf_barrier, stf_barrier_get, stf_barrier_set,static __init int stf_barrier_debugfs_init (void ) { -debugfs_create_file_unsafe ("stf_barrier" ,0600 , powerpc_debugfs_root, +debugfs_create_file_unsafe ("stf_barrier" ,0600 , arch_debugfs_dir,NULL , &fops_stf_barrier);return 0 ; }
@@ -748,7 +748,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_count_cache_flush, count_cache_flush_get,static __init int count_cache_flush_debugfs_init (void ) {debugfs_create_file_unsafe ("count_cache_flush" ,0600 , - powerpc_debugfs_root,NULL , + arch_debugfs_dir,NULL , &fops_count_cache_flush);return 0 ; }
@@ -834,9 +834,9 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_uaccess_flush, uaccess_flush_get, uaccess_flush_setstatic __init int rfi_flush_debugfs_init (void ) { -debugfs_create_file ("rfi_flush" ,0600 , powerpc_debugfs_root,NULL , &fops_rfi_flush); -debugfs_create_file ("entry_flush" ,0600 , powerpc_debugfs_root,NULL , &fops_entry_flush); -debugfs_create_file ("uaccess_flush" ,0600 , powerpc_debugfs_root,NULL , &fops_uaccess_flush); +debugfs_create_file ("rfi_flush" ,0600 , arch_debugfs_dir,NULL , &fops_rfi_flush); +debugfs_create_file ("entry_flush" ,0600 , arch_debugfs_dir,NULL , &fops_entry_flush); +debugfs_create_file ("uaccess_flush" ,0600 , arch_debugfs_dir,NULL , &fops_uaccess_flush);return 0 ; }device_initcall (rfi_flush_debugfs_init);
arch/powerpc/kernel/setup-common.c +0 -13
@@ -33,7 +33,6 @@#include <linux/of_platform.h> #include <linux/hugetlb.h> #include <linux/pgtable.h> -#include <asm/debugfs.h> #include <asm/io.h> #include <asm/paca.h> #include <asm/prom.h>
@@ -773,18 +772,6 @@ static int __init check_cache_coherency(void)late_initcall (check_cache_coherency);#endif /* CONFIG_CHECK_CACHE_COHERENCY */ -#ifdef CONFIG_DEBUG_FS -struct dentry *powerpc_debugfs_root; -EXPORT_SYMBOL (powerpc_debugfs_root); - -static int powerpc_debugfs_init (void ) -{ - powerpc_debugfs_root =debugfs_create_dir ("powerpc" ,NULL ); -return 0 ; -} -arch_initcall (powerpc_debugfs_init); -#endif -void ppc_printk_progress (char *s,unsigned short hex) {pr_info ("%s\n" , s);
arch/powerpc/kernel/setup_64.c +0 -1
@@ -32,7 +32,6 @@#include <linux/nmi.h> #include <linux/pgtable.h> -#include <asm/debugfs.h> #include <asm/kvm_guest.h> #include <asm/io.h> #include <asm/kdump.h>
arch/powerpc/kernel/traps.c +2 -2
@@ -37,10 +37,10 @@#include <linux/smp.h> #include <linux/console.h> #include <linux/kmsg_dump.h> +#include <linux/debugfs.h> #include <asm/emulated_ops.h> #include <linux/uaccess.h> -#include <asm/debugfs.h> #include <asm/interrupt.h> #include <asm/io.h> #include <asm/machdep.h>
@@ -2267,7 +2267,7 @@ static int __init ppc_warn_emulated_init(void)struct ppc_emulated_entry *entries = (void *)&ppc_emulated; dir =debugfs_create_dir ("emulated_instructions" , - powerpc_debugfs_root); + arch_debugfs_dir);debugfs_create_u32 ("do_warn" ,0644 , dir, &ppc_warn_emulated);
arch/powerpc/kvm/book3s_xics.c +3 -3
@@ -10,13 +10,13 @@#include <linux/gfp.h> #include <linux/anon_inodes.h> #include <linux/spinlock.h> - +#include <linux/debugfs.h> #include <linux/uaccess.h> +#include <asm/kvm_book3s.h> #include <asm/kvm_ppc.h> #include <asm/hvcall.h> #include <asm/xics.h> -#include <asm/debugfs.h> #include <asm/time.h> #include <linux/seq_file.h>
@@ -1024,7 +1024,7 @@ static void xics_debugfs_init(struct kvmppc_xics *xics)return ; } - xics->dentry =debugfs_create_file (name,0444 , powerpc_debugfs_root, + xics->dentry =debugfs_create_file (name,0444 , arch_debugfs_dir, xics, &xics_debug_fops);pr_debug ("%s: created %s\n" , __func__, name);
arch/powerpc/kvm/book3s_xive.c +1 -2
@@ -22,7 +22,6 @@#include <asm/xive.h> #include <asm/xive-regs.h> #include <asm/debug.h> -#include <asm/debugfs.h> #include <asm/time.h> #include <asm/opal.h>
@@ -2329,7 +2328,7 @@ static void xive_debugfs_init(struct kvmppc_xive *xive)return ; } - xive->dentry =debugfs_create_file (name,S_IRUGO , powerpc_debugfs_root, + xive->dentry =debugfs_create_file (name,S_IRUGO , arch_debugfs_dir, xive, &xive_debug_fops);pr_debug ("%s: created %s\n" , __func__, name);
arch/powerpc/kvm/book3s_xive_native.c +1 -2
@@ -20,7 +20,6 @@#include <asm/xive.h> #include <asm/xive-regs.h> #include <asm/debug.h> -#include <asm/debugfs.h> #include <asm/opal.h> #include <linux/debugfs.h>
@@ -1257,7 +1256,7 @@ static void xive_native_debugfs_init(struct kvmppc_xive *xive)return ; } - xive->dentry =debugfs_create_file (name,0444 , powerpc_debugfs_root, + xive->dentry =debugfs_create_file (name,0444 , arch_debugfs_dir, xive, &xive_native_debug_fops);pr_debug ("%s: created %s\n" , __func__, name);
arch/powerpc/mm/book3s64/hash_utils.c +2 -2
@@ -36,8 +36,8 @@#include <linux/hugetlb.h> #include <linux/cpu.h> #include <linux/pgtable.h> +#include <linux/debugfs.h> -#include <asm/debugfs.h> #include <asm/interrupt.h> #include <asm/processor.h> #include <asm/mmu.h>
@@ -2072,7 +2072,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_hpt_order, hpt_order_get, hpt_order_set, "%llu\n")static int __init hash64_debugfs (void ) { -debugfs_create_file ("hpt_order" ,0600 , powerpc_debugfs_root,NULL , +debugfs_create_file ("hpt_order" ,0600 , arch_debugfs_dir,NULL , &fops_hpt_order);return 0 ; }
arch/powerpc/mm/book3s64/pgtable.c +2 -2
@@ -6,9 +6,9 @@#include <linux/sched.h> #include <linux/mm_types.h> #include <linux/memblock.h> +#include <linux/debugfs.h> #include <misc/cxl-base.h> -#include <asm/debugfs.h> #include <asm/pgalloc.h> #include <asm/tlb.h> #include <asm/trace.h>
@@ -520,7 +520,7 @@ static int __init pgtable_debugfs_setup(void)* invalidated as expected. */ debugfs_create_bool ("tlbie_enabled" ,0600 , - powerpc_debugfs_root, + arch_debugfs_dir, &tlbie_enabled);return 0 ;
arch/powerpc/mm/book3s64/radix_tlb.c +2 -2
@@ -10,6 +10,7 @@#include <linux/memblock.h> #include <linux/mmu_context.h> #include <linux/sched/mm.h> +#include <linux/debugfs.h> #include <asm/ppc-opcode.h> #include <asm/tlb.h>
@@ -17,7 +18,6 @@#include <asm/trace.h> #include <asm/cputhreads.h> #include <asm/plpar_wrappers.h> -#include <asm/debugfs.h> #include "internal.h"
@@ -1567,7 +1567,7 @@ static const struct file_operations fops_tlbflush = {static int __init create_tlb_single_page_flush_ceiling (void ) {debugfs_create_file ("tlb_single_page_flush_ceiling" ,S_IRUSR |S_IWUSR , - powerpc_debugfs_root,NULL , &fops_tlbflush); + arch_debugfs_dir,NULL , &fops_tlbflush);return 0 ; }late_initcall (create_tlb_single_page_flush_ceiling);
arch/powerpc/mm/ptdump/bats.c +2 -2
@@ -7,7 +7,7 @@*/ #include <linux/pgtable.h> -#include <asm/debugfs.h> +#include <linux/debugfs.h> #include <asm/cpu_has_feature.h> #include "ptdump.h"
@@ -103,7 +103,7 @@ static const struct file_operations bats_fops = {static int __init bats_init (void ) {debugfs_create_file ("block_address_translation" ,0400 , - powerpc_debugfs_root,NULL , &bats_fops); + arch_debugfs_dir,NULL , &bats_fops);return 0 ; }device_initcall (bats_init);
arch/powerpc/mm/ptdump/segment_regs.c +2 -2
@@ -6,7 +6,7 @@* This dumps the content of Segment Registers */ -#include <asm/debugfs.h> +#include <linux/debugfs.h> static void seg_show (struct seq_file *m,int i) {
@@ -55,7 +55,7 @@ static const struct file_operations sr_fops = {static int __init sr_init (void ) { -debugfs_create_file ("segment_registers" ,0400 , powerpc_debugfs_root, +debugfs_create_file ("segment_registers" ,0400 , arch_debugfs_dir,NULL , &sr_fops);return 0 ; }
arch/powerpc/platforms/cell/axon_msi.c +2 -2
@@ -12,8 +12,8 @@#include <linux/export.h> #include <linux/of_platform.h> #include <linux/slab.h> +#include <linux/debugfs.h> -#include <asm/debugfs.h> #include <asm/dcr.h> #include <asm/machdep.h> #include <asm/prom.h>
@@ -480,6 +480,6 @@ void axon_msi_debug_setup(struct device_node *dn, struct axon_msic *msic)snprintf (name,sizeof (name),"msic_%d" ,of_node_to_nid (dn)); - debugfs_create_file(name, 0600, powerpc_debugfs_root, msic, &fops_msic); + debugfs_create_file(name, 0600, arch_debugfs_dir, msic, &fops_msic); }#endif /* DEBUG */
arch/powerpc/platforms/powernv/memtrace.c +1 -2
@@ -18,7 +18,6 @@#include <linux/memory_hotplug.h> #include <linux/numa.h> #include <asm/machdep.h> -#include <asm/debugfs.h> #include <asm/cacheflush.h> /* This enables us to keep track of the memory removed from each node. */
@@ -330,7 +329,7 @@ DEFINE_SIMPLE_ATTRIBUTE(memtrace_init_fops, memtrace_enable_get,static int memtrace_init (void ) { memtrace_debugfs_dir =debugfs_create_dir ("memtrace" , - powerpc_debugfs_root); + arch_debugfs_dir);debugfs_create_file ("enable" ,0600 , memtrace_debugfs_dir,NULL , &memtrace_init_fops);
arch/powerpc/platforms/powernv/opal-imc.c +2 -2
@@ -13,11 +13,11 @@#include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/crash_dump.h> +#include <linux/debugfs.h> #include <asm/opal.h> #include <asm/io.h> #include <asm/imc-pmu.h> #include <asm/cputhreads.h> -#include <asm/debugfs.h> static struct dentry *imc_debugfs_parent;
@@ -56,7 +56,7 @@ static void export_imc_mode_and_cmd(struct device_node *node,u32 cb_offset;struct imc_mem_info *ptr = pmu_ptr->mem_info; - imc_debugfs_parent =debugfs_create_dir ("imc" , powerpc_debugfs_root); + imc_debugfs_parent =debugfs_create_dir ("imc" , arch_debugfs_dir);if (of_property_read_u32 (node,"cb_offset" , &cb_offset)) cb_offset =IMC_CNTL_BLK_OFFSET ;
arch/powerpc/platforms/powernv/opal-lpc.c +2 -2
@@ -10,13 +10,13 @@#include <linux/bug.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/debugfs.h> #include <asm/machdep.h> #include <asm/firmware.h> #include <asm/opal.h> #include <asm/prom.h> #include <linux/uaccess.h> -#include <asm/debugfs.h> #include <asm/isa-bridge.h> static int opal_lpc_chip_id =-1 ;
@@ -371,7 +371,7 @@ static int opal_lpc_init_debugfs(void)if (opal_lpc_chip_id <0 )return -ENODEV ; - root =debugfs_create_dir ("lpc" , powerpc_debugfs_root); + root =debugfs_create_dir ("lpc" , arch_debugfs_dir); rc |=opal_lpc_debugfs_create_type (root,"io" ,OPAL_LPC_IO ); rc |=opal_lpc_debugfs_create_type (root,"mem" ,OPAL_LPC_MEM );
arch/powerpc/platforms/powernv/opal-xscom.c +2 -2
@@ -14,11 +14,11 @@#include <linux/gfp.h> #include <linux/slab.h> #include <linux/uaccess.h> +#include <linux/debugfs.h> #include <asm/machdep.h> #include <asm/firmware.h> #include <asm/opal.h> -#include <asm/debugfs.h> #include <asm/prom.h> static u64 opal_scom_unmangle (u64 addr)
@@ -189,7 +189,7 @@ static int scom_debug_init(void)if (!firmware_has_feature (FW_FEATURE_OPAL ))return 0 ; - root =debugfs_create_dir ("scom" , powerpc_debugfs_root); + root =debugfs_create_dir ("scom" , arch_debugfs_dir);if (!root)return -1 ;
arch/powerpc/platforms/powernv/pci-ioda.c +2 -2
@@ -20,6 +20,7 @@#include <linux/iommu.h> #include <linux/rculist.h> #include <linux/sizes.h> +#include <linux/debugfs.h> #include <asm/sections.h> #include <asm/io.h>
@@ -32,7 +33,6 @@#include <asm/iommu.h> #include <asm/tce.h> #include <asm/xics.h> -#include <asm/debugfs.h> #include <asm/firmware.h> #include <asm/pnv-pci.h> #include <asm/mmzone.h>
@@ -2259,7 +2259,7 @@ static void pnv_pci_ioda_create_dbgfs(void) phb = hose->private_data;sprintf (name,"PCI%04x" , hose->global_number); - phb->dbgfs =debugfs_create_dir (name, powerpc_debugfs_root); + phb->dbgfs =debugfs_create_dir (name, arch_debugfs_dir);debugfs_create_file_unsafe ("dump_diag_regs" ,0200 , phb->dbgfs, phb, &pnv_pci_diag_data_fops);
arch/powerpc/platforms/pseries/dtl.c +2 -2
@@ -11,10 +11,10 @@#include <linux/spinlock.h> #include <asm/smp.h> #include <linux/uaccess.h> +#include <linux/debugfs.h> #include <asm/firmware.h> #include <asm/dtl.h> #include <asm/lppaca.h> -#include <asm/debugfs.h> #include <asm/plpar_wrappers.h> #include <asm/machdep.h>
@@ -338,7 +338,7 @@ static int dtl_init(void)/* set up common debugfs structure */ - dtl_dir =debugfs_create_dir ("dtl" , powerpc_debugfs_root); + dtl_dir =debugfs_create_dir ("dtl" , arch_debugfs_dir);debugfs_create_x8 ("dtl_event_mask" ,0600 , dtl_dir, &dtl_event_mask);debugfs_create_u32 ("dtl_buf_entries" ,0400 , dtl_dir, &dtl_buf_entries);
arch/powerpc/platforms/pseries/lpar.c +3 -2
@@ -22,6 +22,8 @@#include <linux/workqueue.h> #include <linux/proc_fs.h> #include <linux/pgtable.h> +#include <linux/debugfs.h> +#include <asm/processor.h> #include <asm/mmu.h> #include <asm/page.h>
@@ -39,7 +41,6 @@#include <asm/kexec.h> #include <asm/fadump.h> #include <asm/asm-prototypes.h> -#include <asm/debugfs.h> #include <asm/dtl.h> #include "pseries.h"
@@ -2016,7 +2017,7 @@ static int __init vpa_debugfs_init(void)if (!firmware_has_feature (FW_FEATURE_SPLPAR ))return 0 ; - vpa_dir =debugfs_create_dir ("vpa" , powerpc_debugfs_root); + vpa_dir =debugfs_create_dir ("vpa" , arch_debugfs_dir);/* set up the per-cpu vpa file*/ for_each_possible_cpu (i) {
arch/powerpc/sysdev/xive/common.c +1 -2
@@ -21,7 +21,6 @@#include <linux/msi.h> #include <linux/vmalloc.h> -#include <asm/debugfs.h> #include <asm/prom.h> #include <asm/io.h> #include <asm/smp.h>
@@ -1716,7 +1715,7 @@ DEFINE_SHOW_ATTRIBUTE(xive_core_debug);int xive_core_debug_init (void ) {if (xive_enabled ()) -debugfs_create_file ("xive" ,0400 , powerpc_debugfs_root, +debugfs_create_file ("xive" ,0400 , arch_debugfs_dir,NULL , &xive_core_debug_fops);return 0 ; }
arch/powerpc/xmon/xmon.c +3 -3
@@ -26,8 +26,8 @@#include <linux/ctype.h> #include <linux/highmem.h> #include <linux/security.h> +#include <linux/debugfs.h> -#include <asm/debugfs.h> #include <asm/ptrace.h> #include <asm/smp.h> #include <asm/string.h>
@@ -4077,8 +4077,8 @@ DEFINE_SIMPLE_ATTRIBUTE(xmon_dbgfs_ops, xmon_dbgfs_get,static int __init setup_xmon_dbgfs (void ) { -debugfs_create_file ("xmon" ,0600 , powerpc_debugfs_root,NULL , - &xmon_dbgfs_ops); +debugfs_create_file ("xmon" ,0600 , arch_debugfs_dir,NULL , + &xmon_dbgfs_ops);return 0 ; }device_initcall (setup_xmon_dbgfs);
Signature · 1 line
2.31.1