From: "tip-bot2 for Luca Stefani" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Luca Stefani <luca.stefani.ge1@gmail.com>,
Borislav Petkov <bp@suse.de>,
Sami Tolvanen <samitolvanen@google.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: ras/core] RAS/CEC: Fix cec_init() prototype
Date: Tue, 18 Aug 2020 09:02:48 -0000 [thread overview]
Message-ID: <159774136801.3192.8560665046309043144.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200805095708.83939-1-luca.stefani.ge1@gmail.com>
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 71aefb9a89d4ad751726ff5b902896c35c7df5b9
Gitweb: https://git.kernel.org/tip/71aefb9a89d4ad751726ff5b902896c35c7df5b9
Author: Luca Stefani <luca.stefani.ge1@gmail.com>
AuthorDate: Wed, 05 Aug 2020 11:57:08 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 18 Aug 2020 10:50:07 +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: 9554bfe403nd ("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
---
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);
next prev parent reply other threads:[~2020-08-18 9:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 16:18 [PATCH] RAS/CEC: Fix cec_init prototype Luca Stefani
2020-08-05 4:59 ` Borislav Petkov
2020-08-05 9:57 ` [PATCH v2] " Luca Stefani
2020-08-12 21:09 ` Sami Tolvanen
2020-08-17 15:13 ` Borislav Petkov
2020-08-17 15:58 ` Sami Tolvanen
2020-08-17 17:41 ` Borislav Petkov
2020-08-17 18:11 ` Sami Tolvanen
2020-08-17 18:54 ` Borislav Petkov
2020-08-18 9:02 ` tip-bot2 for Luca Stefani [this message]
2020-08-20 8:36 ` [tip: ras/core] RAS/CEC: Fix cec_init() prototype tip-bot2 for Luca Stefani
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159774136801.3192.8560665046309043144.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luca.stefani.ge1@gmail.com \
--cc=samitolvanen@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®