aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-05-02 13:27:05 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:05 -0400
commit803d80f65038f77c4681a0d7708e9d693e68aaa8 (patch)
treecd4e1db8c9c7a73e5764bb2a0cf3bcd89a200edb
parentd18951834216eae82e2f9112416111b4f55f1849 (diff)
[PATCH] x86-64: Some cleanup in time.c
Move prototypes into header files Remove unneeded includes. Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/x86_64/kernel/time.c5
-rw-r--r--include/asm-x86_64/proto.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 75d73a9aa9ff..811b8f987b50 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -39,13 +39,10 @@
39#include <asm/proto.h> 39#include <asm/proto.h>
40#include <asm/hpet.h> 40#include <asm/hpet.h>
41#include <asm/sections.h> 41#include <asm/sections.h>
42#include <linux/cpufreq.h>
43#include <linux/hpet.h> 42#include <linux/hpet.h>
44#include <asm/apic.h> 43#include <asm/apic.h>
45#include <asm/hpet.h> 44#include <asm/hpet.h>
46 45#include <asm/mpspec.h>
47extern void i8254_timer_resume(void);
48extern int using_apic_timer;
49 46
50static char *timename = NULL; 47static char *timename = NULL;
51 48
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 6688cf9eb27b..f64949fae61a 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -122,6 +122,8 @@ extern void smp_local_timer_interrupt(void);
122 122
123long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); 123long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);
124 124
125void i8254_timer_resume(void);
126
125#define round_up(x,y) (((x) + (y) - 1) & ~((y)-1)) 127#define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
126#define round_down(x,y) ((x) & ~((y)-1)) 128#define round_down(x,y) ((x) & ~((y)-1))
127 129