mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-17 05:45:20 +00: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.ge1@gmail.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Sami Tolvanen <samitolvanen@google.com> Tested-by: Sami Tolvanen <samitolvanen@google.com> Link: https://lkml.kernel.org/r/20200805095708.83939-1-luca.stefani.ge1@gmail.com
This commit is contained in:
parent
9123e3a74e
commit
85e6084e0b
@ -553,20 +553,20 @@ static struct notifier_block cec_nb = {
|
|||||||
.priority = MCE_PRIO_CEC,
|
.priority = MCE_PRIO_CEC,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init cec_init(void)
|
static int __init cec_init(void)
|
||||||
{
|
{
|
||||||
if (ce_arr.disabled)
|
if (ce_arr.disabled)
|
||||||
return;
|
return -ENODEV;
|
||||||
|
|
||||||
ce_arr.array = (void *)get_zeroed_page(GFP_KERNEL);
|
ce_arr.array = (void *)get_zeroed_page(GFP_KERNEL);
|
||||||
if (!ce_arr.array) {
|
if (!ce_arr.array) {
|
||||||
pr_err("Error allocating CE array page!\n");
|
pr_err("Error allocating CE array page!\n");
|
||||||
return;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (create_debugfs_nodes()) {
|
if (create_debugfs_nodes()) {
|
||||||
free_page((unsigned long)ce_arr.array);
|
free_page((unsigned long)ce_arr.array);
|
||||||
return;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
INIT_DELAYED_WORK(&cec_work, cec_work_fn);
|
INIT_DELAYED_WORK(&cec_work, cec_work_fn);
|
||||||
@ -575,6 +575,7 @@ static void __init cec_init(void)
|
|||||||
mce_register_decode_chain(&cec_nb);
|
mce_register_decode_chain(&cec_nb);
|
||||||
|
|
||||||
pr_info("Correctable Errors collector initialized.\n");
|
pr_info("Correctable Errors collector initialized.\n");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
late_initcall(cec_init);
|
late_initcall(cec_init);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user