Commit 3f224f4e authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: provide generic arch_debugfs_dir. 



While sh previously had its own debugfs root, there now exists a
common arch_debugfs_dir prototype, so we switch everything over to
that.  Presumably once more architectures start making use of this
we'll be able to just kill off the stub kdebugfs wrapper.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a234ca0f

arch/sh/include/asm/system.h

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ extern unsigned int instruction_size(unsigned int insn); 
extern unsigned long cached_to_uncached;

extern unsigned long uncached_size;



extern struct dentry *sh_debugfs_root;



void per_cpu_trap_init(void);

void default_idle(void);

void cpu_idle_wait(void);

arch/sh/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ endif 
CFLAGS_REMOVE_return_address.o = -pg



obj-y	:= clkdev.o debugtraps.o dma-nommu.o dumpstack.o 		\

	   idle.o io.o irq.o						\

	   irq_$(BITS).o machvec.o nmi_debug.o process.o		\

	   idle.o io.o irq.o irq_$(BITS).o kdebugfs.o			\

	   machvec.o nmi_debug.o process.o				\

	   process_$(BITS).o ptrace.o ptrace_$(BITS).o			\

	   reboot.o return_address.o					\

	   setup.o signal_$(BITS).o sys_sh.o sys_sh$(BITS).o		\

arch/sh/kernel/kdebugfs.c

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/debugfs.h>



struct dentry *arch_debugfs_dir;

EXPORT_SYMBOL(arch_debugfs_dir);



static int __init arch_kdebugfs_init(void)

{

	arch_debugfs_dir = debugfs_create_dir("sh", NULL);

	if (!arch_debugfs_dir)

		return -ENOMEM;



	return 0;

}

arch_initcall(arch_kdebugfs_init);

arch/sh/kernel/setup.c

+0 −15
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/module.h>

#include <linux/smp.h>

#include <linux/err.h>

#include <linux/debugfs.h>

#include <linux/crash_dump.h>

#include <linux/mmzone.h>

#include <linux/clk.h>
@@ -458,17 +457,3 @@ const struct seq_operations cpuinfo_op = { 
	.show	= show_cpuinfo,

};

#endif /* CONFIG_PROC_FS */
 


struct dentry *sh_debugfs_root;



static int __init sh_debugfs_init(void)

{

	sh_debugfs_root = debugfs_create_dir("sh", NULL);

	if (!sh_debugfs_root)

		return -ENOMEM;

	if (IS_ERR(sh_debugfs_root))

		return PTR_ERR(sh_debugfs_root);



	return 0;

}

arch_initcall(sh_debugfs_init);

arch/sh/mm/asids-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int __init asids_debugfs_init(void) 
{

	struct dentry *asids_dentry;



	asids_dentry = debugfs_create_file("asids", S_IRUSR, sh_debugfs_root,

	asids_dentry = debugfs_create_file("asids", S_IRUSR, arch_debugfs_dir,

					   NULL, &asids_debugfs_fops);

	if (!asids_dentry)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE