aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/paravirt.h3
-rw-r--r--include/asm-i386/time.h1
-rw-r--r--include/asm-i386/timer.h8
-rw-r--r--include/asm-i386/vmi_time.h2
4 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h
index 6317e0a4d735..a13230254f4f 100644
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
@@ -94,6 +94,7 @@ struct paravirt_ops
94 94
95 u64 (*read_tsc)(void); 95 u64 (*read_tsc)(void);
96 u64 (*read_pmc)(void); 96 u64 (*read_pmc)(void);
97 u64 (*get_scheduled_cycles)(void);
97 98
98 void (*load_tr_desc)(void); 99 void (*load_tr_desc)(void);
99 void (*load_gdt)(const struct Xgt_desc_struct *); 100 void (*load_gdt)(const struct Xgt_desc_struct *);
@@ -273,6 +274,8 @@ static inline void halt(void)
273 274
274#define rdtscll(val) (val = paravirt_ops.read_tsc()) 275#define rdtscll(val) (val = paravirt_ops.read_tsc())
275 276
277#define get_scheduled_cycles(val) (val = paravirt_ops.get_scheduled_cycles())
278
276#define write_tsc(val1,val2) wrmsr(0x10, val1, val2) 279#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
277 280
278#define rdpmc(counter,low,high) do { \ 281#define rdpmc(counter,low,high) do { \
diff --git a/include/asm-i386/time.h b/include/asm-i386/time.h
index 571b4294dc2e..ea8065af825a 100644
--- a/include/asm-i386/time.h
+++ b/include/asm-i386/time.h
@@ -30,7 +30,6 @@ static inline int native_set_wallclock(unsigned long nowtime)
30 30
31#ifdef CONFIG_PARAVIRT 31#ifdef CONFIG_PARAVIRT
32#include <asm/paravirt.h> 32#include <asm/paravirt.h>
33extern unsigned long long native_sched_clock(void);
34#else /* !CONFIG_PARAVIRT */ 33#else /* !CONFIG_PARAVIRT */
35 34
36#define get_wallclock() native_get_wallclock() 35#define get_wallclock() native_get_wallclock()
diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h
index 4752c3a6a708..d1f7b4f575b4 100644
--- a/include/asm-i386/timer.h
+++ b/include/asm-i386/timer.h
@@ -4,13 +4,19 @@
4#include <linux/pm.h> 4#include <linux/pm.h>
5 5
6#define TICK_SIZE (tick_nsec / 1000) 6#define TICK_SIZE (tick_nsec / 1000)
7
7void setup_pit_timer(void); 8void setup_pit_timer(void);
9unsigned long long native_sched_clock(void);
10
8/* Modifiers for buggy PIT handling */ 11/* Modifiers for buggy PIT handling */
9extern int pit_latch_buggy; 12extern int pit_latch_buggy;
10extern int timer_ack; 13extern int timer_ack;
11extern int no_timer_check; 14extern int no_timer_check;
12extern unsigned long long (*custom_sched_clock)(void);
13extern int no_sync_cmos_clock; 15extern int no_sync_cmos_clock;
14extern int recalibrate_cpu_khz(void); 16extern int recalibrate_cpu_khz(void);
15 17
18#ifndef CONFIG_PARAVIRT
19#define get_scheduled_cycles(val) rdtscll(val)
20#endif
21
16#endif 22#endif
diff --git a/include/asm-i386/vmi_time.h b/include/asm-i386/vmi_time.h
index c12931211007..f59c35d37352 100644
--- a/include/asm-i386/vmi_time.h
+++ b/include/asm-i386/vmi_time.h
@@ -49,7 +49,7 @@ extern struct vmi_timer_ops {
49extern void __init vmi_time_init(void); 49extern void __init vmi_time_init(void);
50extern unsigned long vmi_get_wallclock(void); 50extern unsigned long vmi_get_wallclock(void);
51extern int vmi_set_wallclock(unsigned long now); 51extern int vmi_set_wallclock(unsigned long now);
52extern unsigned long long vmi_sched_clock(void); 52extern unsigned long long vmi_get_sched_cycles(void);
53 53
54#ifdef CONFIG_X86_LOCAL_APIC 54#ifdef CONFIG_X86_LOCAL_APIC
55extern void __init vmi_timer_setup_boot_alarm(void); 55extern void __init vmi_timer_setup_boot_alarm(void);