[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 11 Nov 2009 11:42:45 GMT
From: tip-bot for Yong Wang <yong.y.wang@...ux.intel.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yong.y.wang@...ux.intel.com, yong.y.wang@...el.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/mce] x86: Mark the thermal init functions __init
Commit-ID: ce6b5d768c79b9d5dd6345c033bae781d5ca9b8e
Gitweb: http://git.kernel.org/tip/ce6b5d768c79b9d5dd6345c033bae781d5ca9b8e
Author: Yong Wang <yong.y.wang@...ux.intel.com>
AuthorDate: Wed, 11 Nov 2009 15:51:25 +0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 11 Nov 2009 12:33:32 +0100
x86: Mark the thermal init functions __init
Mark the thermal init functions __init so that the init memory
can be freed.
Signed-off-by: Yong Wang <yong.y.wang@...el.com>
LKML-Reference: <20091111075125.GA17900@...ng-moblin2.bj.intel.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 7f3cf36..8a73d5c 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -256,7 +256,7 @@ asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)
ack_APIC_irq();
}
-void mcheck_intel_therm_init(void)
+void __init mcheck_intel_therm_init(void)
{
/*
* This function is only called on boot CPU. Save the init thermal
@@ -268,7 +268,7 @@ void mcheck_intel_therm_init(void)
lvtthmr_init = apic_read(APIC_LVTTHMR);
}
-void intel_init_thermal(struct cpuinfo_x86 *c)
+void __init intel_init_thermal(struct cpuinfo_x86 *c)
{
unsigned int cpu = smp_processor_id();
int tm2 = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists