diff options
Diffstat (limited to 'p07')
| -rw-r--r-- | p07 | 22 |
1 files changed, 9 insertions, 13 deletions
@@ -17,16 +17,16 @@ Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Pu Wen <puwen@hygon.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - arch/x86/kernel/cpu/mce/core.c | 15 ++++----------- + arch/x86/kernel/cpu/mce/core.c | 12 +++--------- arch/x86/kernel/cpu/mce/inject.c | 34 +++++----------------------------- arch/x86/kernel/cpu/mce/severity.c | 14 +++----------- - 3 files changed, 12 insertions(+), 51 deletions(-) + 3 files changed, 11 insertions(+), 49 deletions(-) --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c -@@ -2428,22 +2428,15 @@ static int fake_panic_set(void *data, u6 - DEFINE_SIMPLE_ATTRIBUTE(fake_panic_fops, fake_panic_get, - fake_panic_set, "%llu\n"); +@@ -2440,22 +2440,16 @@ static int fake_panic_set(void *data, u6 + DEFINE_DEBUGFS_ATTRIBUTE(fake_panic_fops, fake_panic_get, fake_panic_set, + "%llu\n"); -static int __init mcheck_debugfs_init(void) +static void __init mcheck_debugfs_init(void) @@ -37,13 +37,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> dmce = mce_get_debugfs_dir(); - if (!dmce) - return -ENOMEM; -- ffake_panic = debugfs_create_file("fake_panic", 0444, dmce, NULL, -- &fake_panic_fops); + ffake_panic = debugfs_create_file_unsafe("fake_panic", 0444, dmce, + NULL, &fake_panic_fops); - if (!ffake_panic) - return -ENOMEM; - - return 0; -+ debugfs_create_file("fake_panic", 0444, dmce, NULL, &fake_panic_fops); } #else -static int __init mcheck_debugfs_init(void) { return -EINVAL; } @@ -53,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> DEFINE_STATIC_KEY_FALSE(mcsafe_key); --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c -@@ -648,7 +648,6 @@ static const struct file_operations read +@@ -652,7 +652,6 @@ static const struct file_operations read static struct dfs_node { char *name; @@ -61,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> const struct file_operations *fops; umode_t perm; } dfs_fls[] = { -@@ -662,7 +661,7 @@ static struct dfs_node { +@@ -666,35 +665,16 @@ static struct dfs_node { { .name = "README", .fops = &readme_fops, .perm = S_IRUSR | S_IRGRP | S_IROTH }, }; @@ -69,9 +68,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +static void __init debugfs_init(void) { unsigned int i; - u64 cap; -@@ -671,30 +670,11 @@ static int __init debugfs_init(void) - n_banks = cap & MCG_BANKCNT_MASK; dfs_inj = debugfs_create_dir("mce-inject", NULL); - if (!dfs_inj) |