diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
| commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
| tree | df2373bb1119468873c667624769455c36dc3786 /kern/timer.h | |
| parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
| parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/timer.h')
| -rw-r--r-- | kern/timer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kern/timer.h b/kern/timer.h index 817fa356..2f473cf8 100644 --- a/kern/timer.h +++ b/kern/timer.h @@ -27,7 +27,7 @@ #ifndef _KERN_TIMER_H_ #define _KERN_TIMER_H_ -#include <kern/macro_help.h> +#include <kern/macros.h> #if STAT_TIME /* @@ -168,7 +168,7 @@ extern void time_int_exit(unsigned, timer_t); #define TIMER_DELTA(timer, save, result) \ MACRO_BEGIN \ - register unsigned temp; \ + unsigned temp; \ \ temp = (timer).low_bits; \ if ((save).high != (timer).high_bits_check) { \ @@ -182,4 +182,6 @@ MACRO_END extern void init_timers(void); +void timer_init(timer_t this_timer); + #endif /* _KERN_TIMER_H_ */ |