aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-06-15 04:27:13 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-06-16 19:56:09 -0400
commit1149e7264528723b8c3b075a90386ceb2e07070a (patch)
treea0bdbcee8b0d6e84f18aee101b7f0858ed4b9a3d /arch/x86/kernel
parent8363fc82d36c0886292e33925391dca93f03bd50 (diff)
x86, mce: remove therm_throt.h
Now all symbols in the header are static. Remove the header. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_intel_64.c1
-rw-r--r--arch/x86/kernel/cpu/mcheck/p4.c1
-rw-r--r--arch/x86/kernel/cpu/mcheck/therm_throt.c5
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 3b7a0572e2f..663a88e8b3c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@ -11,7 +11,6 @@
11#include <asm/processor.h> 11#include <asm/processor.h>
12#include <asm/msr.h> 12#include <asm/msr.h>
13#include <asm/mce.h> 13#include <asm/mce.h>
14#include <asm/therm_throt.h>
15 14
16/* 15/*
17 * Support for Intel Correct Machine Check Interrupts. This allows 16 * Support for Intel Correct Machine Check Interrupts. This allows
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
index 76c5f0305f9..4482aea9aa2 100644
--- a/arch/x86/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
@@ -6,7 +6,6 @@
6#include <linux/init.h> 6#include <linux/init.h>
7#include <linux/smp.h> 7#include <linux/smp.h>
8 8
9#include <asm/therm_throt.h>
10#include <asm/processor.h> 9#include <asm/processor.h>
11#include <asm/mce.h> 10#include <asm/mce.h>
12#include <asm/msr.h> 11#include <asm/msr.h>
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 7c7944cc515..bff8dd191dd 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -24,7 +24,6 @@
24#include <linux/smp.h> 24#include <linux/smp.h>
25#include <linux/cpu.h> 25#include <linux/cpu.h>
26 26
27#include <asm/therm_throt.h>
28#include <asm/processor.h> 27#include <asm/processor.h>
29#include <asm/system.h> 28#include <asm/system.h>
30#include <asm/apic.h> 29#include <asm/apic.h>
@@ -38,7 +37,7 @@
38static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES; 37static DEFINE_PER_CPU(__u64, next_check) = INITIAL_JIFFIES;
39static DEFINE_PER_CPU(unsigned long, thermal_throttle_count); 38static DEFINE_PER_CPU(unsigned long, thermal_throttle_count);
40 39
41atomic_t therm_throt_en = ATOMIC_INIT(0); 40static atomic_t therm_throt_en = ATOMIC_INIT(0);
42 41
43#ifdef CONFIG_SYSFS 42#ifdef CONFIG_SYSFS
44#define define_therm_throt_sysdev_one_ro(_name) \ 43#define define_therm_throt_sysdev_one_ro(_name) \
@@ -93,7 +92,7 @@ static struct attribute_group thermal_throttle_attr_group = {
93 * 1 : Event should be logged further, and a message has been 92 * 1 : Event should be logged further, and a message has been
94 * printed to the syslog. 93 * printed to the syslog.
95 */ 94 */
96int therm_throt_process(int curr) 95static int therm_throt_process(int curr)
97{ 96{
98 unsigned int cpu = smp_processor_id(); 97 unsigned int cpu = smp_processor_id();
99 __u64 tmp_jiffs = get_jiffies_64(); 98 __u64 tmp_jiffs = get_jiffies_64();