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 <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210812132831.233794-2-aneesh.kumar@linux.ibm.com

diff --git a/arch/powerpc/include/asm/debugfs.h b/arch/powerpc/include/asm/debugfs.h
deleted file mode 100644 (file)
index 2c5c485..0000000
--- a/arch/powerpc/include/asm/debugfs.h
+++ /dev/null
@@ -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 */

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index f66b63e81c3bc218e37a99cafa18808fb062a85e..7be36c1e1db6da39cca8e8e4af7e37a5e2c0db23 100644 (file)
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -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

diff --git a/arch/powerpc/kernel/dawr.c b/arch/powerpc/kernel/dawr.c
index cdc2dccb987dca0e2b33931b90770ee14ca456e5..64e423d2fe0f113aa19d125c09da075c6cde21f4 100644 (file)
--- a/arch/powerpc/kernel/dawr.c
+++ b/arch/powerpc/kernel/dawr.c
@@ -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);
        }

diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 3bbdcc86d01ba85663bd7c62d67ca788f5db6b80..e9b597ed423cf775b73b2126a9b88311dd339e52 100644 (file)
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -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

diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c
index bf3270426d82d6569d48fedb0fefbbf7d1061b06..9bdaaf7fddc9531a22ace2c398a7ce9e57ca3f9a 100644 (file)
--- a/arch/powerpc/kernel/eeh_cache.c
+++ b/arch/powerpc/kernel/eeh_cache.c
@@ -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);
 }

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index b990075285f57cf62f10a147b201244e91a77d5e..b7ceb041743c92726277cfcc9fa7a39c0670d4b9 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -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) {

diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index 21a638aff72fb9246f59d4d0fbf03bff1f5becd6..91a3be14808b112e01276b659b27d0708ad6a662 100644 (file)
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -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>

diff --git a/arch/powerpc/kernel/kdebugfs.c b/arch/powerpc/kernel/kdebugfs.c
new file mode 100644 (file)
index 0000000..36d3124
--- /dev/null
+++ b/arch/powerpc/kernel/kdebugfs.c
@@ -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);

diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index cc51fa52e783150dabff0f634fd5ddc2162ee321..1a998490fe60f04555c1a95422eb47a6d7c0e39a 100644 (file)
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -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_set
 
 static __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);

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index aa9c2d01424af8cf6d7c0c7382e14bf862e61cef..b1e43b69a559d5486028926eda5ec736fe659120 100644 (file)
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -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);

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 1ff258f6c76c2733ce5c7dde8f0e6868be3e6aae..eaa79a0996d1b5307b2e2635f633c89891f3e5d0 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -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>

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index dfbce527c98ed2632252a2e7b453c6d006109ca5..c8f648727d36da444104618cf9884f2ac79a5063 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -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);
 

diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 303e3cb096db73a62cdddb05343da92118a108c6..ebd5d920de8c1ef3db90ab320185381ddc003ef6 100644 (file)
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -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);

diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index 912c1e9eef6b4302295fa976eeddbff22a21eb20..a18db9e16ea4055ba2da592c76f26c20a91cb2b6 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -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>
 
@@ -2360,7 +2359,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);

diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/book3s_xive_native.c
index af65ea21bde7cc7ac6f48391d2892dc2111f3b46..99db9ac49901b853d3b01ba3049b2b1244e3fdaa 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive_native.c
+++ b/arch/powerpc/kvm/book3s_xive_native.c
@@ -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>
@@ -1268,7 +1267,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);

diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index ac5720371c0d994bc4f002836ab74c9da99a472c..c145776d3ae5effc1b1a43a323d313941e1b1218 100644 (file)
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -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;
 }

diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c
index 300099de553b84d35fea1b7335922966b0a1c58b..9e16c7b1a6c5680fe1f9dcd0daab01592a0556c4 100644 (file)
--- a/arch/powerpc/mm/book3s64/pgtable.c
+++ b/arch/powerpc/mm/book3s64/pgtable.c
@@ -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;

diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
index 1fa2bc6a969eed74db35aec636cd328160b67b2d..7724af19ed7e68da9e4fd23767359b098e6832bf 100644 (file)
--- a/arch/powerpc/mm/book3s64/radix_tlb.c
+++ b/arch/powerpc/mm/book3s64/radix_tlb.c
@@ -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"
 
@@ -1529,9 +1529,9 @@ EXPORT_SYMBOL_GPL(do_h_rpt_invalidate_prt);
 static int __init create_tlb_single_page_flush_ceiling(void)
 {
        debugfs_create_u32("tlb_single_page_flush_ceiling", 0600,
-                          powerpc_debugfs_root, &tlb_single_page_flush_ceiling);
+                          arch_debugfs_dir, &tlb_single_page_flush_ceiling);
        debugfs_create_u32("tlb_local_single_page_flush_ceiling", 0600,
-                          powerpc_debugfs_root, &tlb_local_single_page_flush_ceiling);
+                          arch_debugfs_dir, &tlb_local_single_page_flush_ceiling);
        return 0;
 }
 late_initcall(create_tlb_single_page_flush_ceiling);

diff --git a/arch/powerpc/mm/ptdump/bats.c b/arch/powerpc/mm/ptdump/bats.c
index c4c628b03cf8715789b2b1ca08956ff8ff8cf2e7..8bf7383fb26c8073ca699ee936ba74871186b8db 100644 (file)
--- a/arch/powerpc/mm/ptdump/bats.c
+++ b/arch/powerpc/mm/ptdump/bats.c
@@ -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);

diff --git a/arch/powerpc/mm/ptdump/segment_regs.c b/arch/powerpc/mm/ptdump/segment_regs.c
index 565048a0c9be3b45e4c2283ea6e906a191cee9e1..9223dfb85c517ad69b2db5e06bbb90adadd232f7 100644 (file)
--- a/arch/powerpc/mm/ptdump/segment_regs.c
+++ b/arch/powerpc/mm/ptdump/segment_regs.c
@@ -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;
 }

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index ca2555b8a0c2aa5cde7b68eef818dc54750f9f52..82335e364c440705d5b1c00ed6b2d00e84edd8e0 100644 (file)
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -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 */

diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c
index 537a4daed6149dde2b5ce7489261ffb615b07f4c..877720c645151f55056f4cbf3a1f7ae964c4573b 100644 (file)
--- a/arch/powerpc/platforms/powernv/memtrace.c
+++ b/arch/powerpc/platforms/powernv/memtrace.c
@@ -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);

diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index ba02a75c1410225201fbbe935cdadf10682bee35..05d3832019b99fa0d6bb499d60aae91f980ddc3a 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -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;

diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
index 608569082ba0bb12e555c0b4b2ad4c392bcdd6ba..1e5d51db40f84959d29845acfe7153f6be83b33f 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-lpc.c
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -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);

diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c
index fd510d961b8c7ce14abeef965a609f9f4227d76d..6b4eed2ef4fa96e21dc5aca398650df01903d6b5 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-xscom.c
+++ b/arch/powerpc/platforms/powernv/opal-xscom.c
@@ -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;
 

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 2389cd79c3c88d83748faf28657a9e77f78cc6d7..3dd35c327d1c53bae493d209e2d0ab17b61af8a0 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -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>
@@ -2475,7 +2475,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);

diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index 982f069e4c318a8fc2faf744aebf3279ee674b8e..352af5b14a0f7bc62ec2f9d1ecdcc3a9dea49613 100644 (file)
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -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);

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 869ef638698abeb9d51d35725fb6a9b8872a12b3..bd1fcb0881ea892a7c2a6aa4cfcb4b4d27dfb7e7 100644 (file)
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -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"
@@ -2019,7 +2020,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) {

diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
index 4018964bbd69924b1d9d7ad2285315d5b789f126..458645c7a72bf3f8f5ad010e0da2e510fa69e1f5 100644 (file)
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@ -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>
@@ -1769,7 +1768,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;
 }

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index da4d7f225a409bc03b0cf84a67fea7724833bed3..ead460b809053455e6c295241e2afe341e9f7e5c 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -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);