From: "Jan Beulich" <JBeulich@suse.com>
To: <mingo@elte.hu>, <tglx@linutronix.de>, <hpa@zytor.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: convert a few mistaken __cpuinit annotations to __init
Date: Fri, 23 Nov 2012 16:33:05 +0000 [thread overview]
Message-ID: <50AFB35102000078000AAECA@nat28.tlf.novell.com> (raw)
The first two are functions serving as initcalls; the SFI one is only
being called from __init code.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
arch/x86/mm/tlb.c | 2 +-
arch/x86/platform/sfi/sfi.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- 3.7-rc6/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ 3.7-rc6-x86-sections/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1192,7 +1192,7 @@ static struct notifier_block __cpuinitda
.notifier_call = cacheinfo_cpu_callback,
};
-static int __cpuinit cache_sysfs_init(void)
+static int __init cache_sysfs_init(void)
{
int i;
--- 3.7-rc6/arch/x86/mm/tlb.c
+++ 3.7-rc6-x86-sections/arch/x86/mm/tlb.c
@@ -335,7 +335,7 @@ static const struct file_operations fops
.llseek = default_llseek,
};
-static int __cpuinit create_tlb_flushall_shift(void)
+static int __init create_tlb_flushall_shift(void)
{
if (cpu_has_invlpg) {
debugfs_create_file("tlb_flushall_shift", S_IRUSR | S_IWUSR,
--- 3.7-rc6/arch/x86/platform/sfi/sfi.c
+++ 3.7-rc6-x86-sections/arch/x86/platform/sfi/sfi.c
@@ -35,7 +35,7 @@
static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
/* All CPUs enumerated by SFI must be present and enabled */
-static void __cpuinit mp_sfi_register_lapic(u8 id)
+static void __init mp_sfi_register_lapic(u8 id)
{
if (MAX_LOCAL_APIC - id <= 0) {
pr_warning("Processor #%d invalid (max %d)\n",
next reply other threads:[~2012-11-23 16:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-23 16:33 Jan Beulich [this message]
2013-01-24 20:35 ` [tip:x86/debug] x86: Convert " tip-bot for Jan Beulich
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=50AFB35102000078000AAECA@nat28.tlf.novell.com \
--to=jbeulich@suse.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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®