Commit dbf77fed authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

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: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210812132831.233794-2-aneesh.kumar@linux.ibm.com
parent 3e188b1a

arch/powerpc/include/asm/debugfs.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}