The following commit has been merged into the ras/core branch of tip:
Commit-ID: 85e6084e0b436cabe9c909e679937998ffbf9c9d
Gitweb:
https://git.kernel.org/tip/85e6084e0b436cabe9c909e679937998ffbf9c9d
Author: Luca Stefani <luca.stefani....@gmail.com>
AuthorDate: Wed, 05 Aug 2020 11:57:08 +02:00
Committer: Borislav Petkov <b...@suse.de>
CommitterDate: Thu, 20 Aug 2020 10:33:33 +02:00
RAS/CEC: Fix cec_init() prototype
late_initcall() expects a function that returns an integer. Update the
function signature to match.
[ bp: Massage commit message into proper sentences. ]
Fixes: 9554bfe403bd ("x86/mce: Convert the CEC to use the MCE notifier")
Signed-off-by: Luca Stefani <luca.stefani....@gmail.com>
Signed-off-by: Borislav Petkov <b...@suse.de>
Reviewed-by: Sami Tolvanen <samitolva...@google.com>
Tested-by: Sami Tolvanen <samitolva...@google.com>
Link:
https://lkml.kernel.org/r/20200805095708.83939-1-luca.stefani....@gmail.com
---
drivers/ras/cec.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
index 569d9ad..6939aa5 100644
--- a/drivers/ras/cec.c
+++ b/drivers/ras/cec.c
@@ -553,20 +553,20 @@ static struct notifier_block cec_nb = {
.priority = MCE_PRIO_CEC,
};
-static void __init cec_init(void)
+static int __init cec_init(void)
{
if (ce_arr.disabled)
- return;
+ return -ENODEV;
ce_arr.array = (void *)get_zeroed_page(GFP_KERNEL);
if (!ce_arr.array) {
pr_err("Error allocating CE array page!\n");
- return;
+ return -ENOMEM;
}
if (create_debugfs_nodes()) {
free_page((unsigned long)ce_arr.array);
- return;
+ return -ENOMEM;
}
INIT_DELAYED_WORK(&cec_work, cec_work_fn);
@@ -575,6 +575,7 @@ static void __init cec_init(void)
mce_register_decode_chain(&cec_nb);
pr_info("Correctable Errors collector initialized.\n");
+ return 0;
}
late_initcall(cec_init);
