diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 15:01:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 15:01:43 +0200 |
| commit | f5b3fcfe96d6328cbac586d25823527a257b5995 (patch) | |
| tree | 03ce7d8f4a8868efbac7f3edab816915bfba87f6 /p07 | |
| parent | eb49b51a091d445ec2f737712b88687ed54651b8 (diff) | |
| download | patches-f5b3fcfe96d6328cbac586d25823527a257b5995.tar.gz | |
refresh for 5.3-rc1
Diffstat (limited to 'p07')
| -rw-r--r-- | p07 | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/p07 b/p07 deleted file mode 100644 index 00153eab60f91e..00000000000000 --- a/p07 +++ /dev/null @@ -1,142 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] x86: mce: no need to check return value of debugfs_create functions - -When calling debugfs functions, there is no need to ever check the -return value. The function can work or not, but the code logic should -never do something different based on this. - -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: Ingo Molnar <mingo@redhat.com> -Cc: Borislav Petkov <bp@alien8.de> -Cc: "H. Peter Anvin" <hpa@zytor.com> -Cc: <x86@kernel.org> -Cc: Tony Luck <tony.luck@intel.com> -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 | 12 +++--------- - arch/x86/kernel/cpu/mce/inject.c | 34 +++++----------------------------- - arch/x86/kernel/cpu/mce/severity.c | 14 +++----------- - 3 files changed, 11 insertions(+), 49 deletions(-) - ---- a/arch/x86/kernel/cpu/mce/core.c -+++ b/arch/x86/kernel/cpu/mce/core.c -@@ -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) - { -- struct dentry *dmce, *ffake_panic; -+ struct dentry *dmce; - - dmce = mce_get_debugfs_dir(); -- if (!dmce) -- return -ENOMEM; - ffake_panic = debugfs_create_file_unsafe("fake_panic", 0444, dmce, - NULL, &fake_panic_fops); -- if (!ffake_panic) -- return -ENOMEM; -- -- return 0; - } - #else --static int __init mcheck_debugfs_init(void) { return -EINVAL; } -+static void __init mcheck_debugfs_init(void) { } - #endif - - DEFINE_STATIC_KEY_FALSE(mcsafe_key); ---- a/arch/x86/kernel/cpu/mce/inject.c -+++ b/arch/x86/kernel/cpu/mce/inject.c -@@ -652,7 +652,6 @@ static const struct file_operations read - - static struct dfs_node { - char *name; -- struct dentry *d; - const struct file_operations *fops; - umode_t perm; - } dfs_fls[] = { -@@ -666,35 +665,16 @@ static struct dfs_node { - { .name = "README", .fops = &readme_fops, .perm = S_IRUSR | S_IRGRP | S_IROTH }, - }; - --static int __init debugfs_init(void) -+static void __init debugfs_init(void) - { - unsigned int i; - - dfs_inj = debugfs_create_dir("mce-inject", NULL); -- if (!dfs_inj) -- return -EINVAL; - -- for (i = 0; i < ARRAY_SIZE(dfs_fls); i++) { -- dfs_fls[i].d = debugfs_create_file(dfs_fls[i].name, -- dfs_fls[i].perm, -- dfs_inj, -- &i_mce, -- dfs_fls[i].fops); -- -- if (!dfs_fls[i].d) -- goto err_dfs_add; -- } -- -- return 0; -- --err_dfs_add: -- while (i-- > 0) -- debugfs_remove(dfs_fls[i].d); -+ for (i = 0; i < ARRAY_SIZE(dfs_fls); i++) -+ debugfs_create_file(dfs_fls[i].name, dfs_fls[i].perm, dfs_inj, -+ &i_mce, dfs_fls[i].fops); - -- debugfs_remove(dfs_inj); -- dfs_inj = NULL; -- -- return -ENODEV; - } - - static int __init inject_init(void) -@@ -704,11 +684,7 @@ static int __init inject_init(void) - if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL)) - return -ENOMEM; - -- err = debugfs_init(); -- if (err) { -- free_cpumask_var(mce_inject_cpumask); -- return err; -- } -+ debugfs_init(); - - register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0, "mce_notify"); - mce_register_injector_chain(&inject_nb); ---- a/arch/x86/kernel/cpu/mce/severity.c -+++ b/arch/x86/kernel/cpu/mce/severity.c -@@ -404,21 +404,13 @@ static const struct file_operations seve - - static int __init severities_debugfs_init(void) - { -- struct dentry *dmce, *fsev; -+ struct dentry *dmce; - - dmce = mce_get_debugfs_dir(); -- if (!dmce) -- goto err_out; -- -- fsev = debugfs_create_file("severities-coverage", 0444, dmce, NULL, -- &severities_coverage_fops); -- if (!fsev) -- goto err_out; - -+ debugfs_create_file("severities-coverage", 0444, dmce, NULL, -+ &severities_coverage_fops); - return 0; -- --err_out: -- return -ENOMEM; - } - late_initcall(severities_debugfs_init); - #endif /* CONFIG_DEBUG_FS */ |