The first two are functions serving as initcalls; the SFI one is only
being called from __init code.
Signed-off-by: Jan Beulich <jbeul...@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",
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
