git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-i386
/
timer.h
diff --git
a/include/asm-i386/timer.h
b/include/asm-i386/timer.h
index
585d947
..
aed1643
100644
(file)
--- a/
include/asm-i386/timer.h
+++ b/
include/asm-i386/timer.h
@@
-1,5
+1,7
@@
#ifndef _ASMi386_TIMER_H
#define _ASMi386_TIMER_H
#ifndef _ASMi386_TIMER_H
#define _ASMi386_TIMER_H
+#include <linux/init.h>
+#include <linux/pm.h>
/**
* struct timer_ops - used to define a timer source
/**
* struct timer_ops - used to define a timer source
@@
-15,19
+17,27
@@
* timer.
* @delay: delays this many clock cycles.
*/
* timer.
* @delay: delays this many clock cycles.
*/
-struct timer_opts{
+struct timer_opts
{
char* name;
char* name;
- int (*init)(char *override);
void (*mark_offset)(void);
unsigned long (*get_offset)(void);
unsigned long long (*monotonic_clock)(void);
void (*delay)(unsigned long);
void (*mark_offset)(void);
unsigned long (*get_offset)(void);
unsigned long long (*monotonic_clock)(void);
void (*delay)(unsigned long);
+ unsigned long (*read_timer)(void);
+ int (*suspend)(pm_message_t state);
+ int (*resume)(void);
+};
+
+struct init_timer_opts {
+ int (*init)(char *override);
+ struct timer_opts *opts;
};
#define TICK_SIZE (tick_nsec / 1000)
};
#define TICK_SIZE (tick_nsec / 1000)
-extern struct timer_opts* select_timer(void);
+extern struct timer_opts*
__init
select_timer(void);
extern void clock_fallback(void);
extern void clock_fallback(void);
+void setup_pit_timer(void);
/* Modifiers for buggy PIT handling */
/* Modifiers for buggy PIT handling */
@@
-39,19
+49,22
@@
extern int timer_ack;
/* list of externed timers */
extern struct timer_opts timer_none;
extern struct timer_opts timer_pit;
/* list of externed timers */
extern struct timer_opts timer_none;
extern struct timer_opts timer_pit;
-extern struct timer_opts timer_tsc;
+extern struct init_timer_opts timer_pit_init;
+extern struct init_timer_opts timer_tsc_init;
#ifdef CONFIG_X86_CYCLONE_TIMER
#ifdef CONFIG_X86_CYCLONE_TIMER
-extern struct
timer_opts timer_cyclone
;
+extern struct
init_timer_opts timer_cyclone_init
;
#endif
extern unsigned long calibrate_tsc(void);
#endif
extern unsigned long calibrate_tsc(void);
+extern unsigned long read_timer_tsc(void);
extern void init_cpu_khz(void);
extern void init_cpu_khz(void);
+extern int recalibrate_cpu_khz(void);
#ifdef CONFIG_HPET_TIMER
#ifdef CONFIG_HPET_TIMER
-extern struct
timer_opts timer_hpe
t;
+extern struct
init_timer_opts timer_hpet_ini
t;
extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);
#endif
#ifdef CONFIG_X86_PM_TIMER
extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);
#endif
#ifdef CONFIG_X86_PM_TIMER
-extern struct
timer_opts timer_pmtmr
;
+extern struct
init_timer_opts timer_pmtmr_init
;
#endif
#endif
#endif
#endif