openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86, mce: Move debugfs mce dir creating to mce.c 

Because more debugfs files under mce dir will be create in mce.c.

ChangeLog:

v5:

- Rebased on x86-tip.git/mce

Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Huang Ying 2009-07-31 09:41:42 +08:00 committed by H. Peter Anvin
parent 0dcc66851f
commit 5be9ed251f
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/cpu/mcheck/mce-internal.h
View File

@ -22,6 +22,7 @@ struct mce_bank {
}; };
int mce_severity(struct mce *a, int tolerant, char **msg); int mce_severity(struct mce *a, int tolerant, char **msg);
struct dentry *mce_get_debugfs_dir(void);
extern int mce_ser; extern int mce_ser;

4
arch/x86/kernel/cpu/mcheck/mce-severity.c
View File

@ -197,7 +197,7 @@ static int __init severities_debugfs_init(void)
{ {
struct dentry *dmce = NULL, *fseverities_coverage = NULL; struct dentry *dmce = NULL, *fseverities_coverage = NULL;
dmce = debugfs_create_dir("mce", NULL); dmce = mce_get_debugfs_dir();
if (dmce == NULL) if (dmce == NULL)
goto err_out; goto err_out;
fseverities_coverage = debugfs_create_file("severities-coverage", fseverities_coverage = debugfs_create_file("severities-coverage",
@ -209,8 +209,6 @@ static int __init severities_debugfs_init(void)
return 0; return 0;
err_out: err_out:
if (dmce)
debugfs_remove(dmce);
return -ENOMEM; return -ENOMEM;
} }
late_initcall(severities_debugfs_init); late_initcall(severities_debugfs_init);

13
arch/x86/kernel/cpu/mcheck/mce.c
View File

@ -34,6 +34,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/debugfs.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/hw_irq.h> #include <asm/hw_irq.h>
@ -2003,3 +2004,15 @@ static int __init mcheck_disable(char *str)
return 1; return 1;
} }
__setup("nomce", mcheck_disable); __setup("nomce", mcheck_disable);
#ifdef CONFIG_DEBUG_FS
struct dentry *mce_get_debugfs_dir(void)
{
static struct dentry *dmce;
if (!dmce)
dmce = debugfs_create_dir("mce", NULL);
return dmce;
}
#endif