summaryrefslogtreecommitdiff
path: root/kern/mach_clock.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-02-04 10:27:44 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-02-04 10:27:44 +0100
commitba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch)
tree9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /kern/mach_clock.c
parentbfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff)
parent51e87d005139a435cd846ac5c224eed5042c4fa0 (diff)
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/mach_clock.c')
-rw-r--r--kern/mach_clock.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 04a31153..edf87f07 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -47,7 +47,6 @@
#include <kern/host.h>
#include <kern/lock.h>
#include <kern/mach_clock.h>
-#include <kern/mach_param.h>
#include <kern/processor.h>
#include <kern/queue.h>
#include <kern/sched.h>
@@ -91,7 +90,7 @@ int bigadj = 1000000; /* adjust 10*tickadj if adjustment
* } while (secs != mtime->check_seconds);
* to read the time correctly. (On a multiprocessor this assumes
* that processors see each other's writes in the correct order.
- * We may have to insert fence operations.)
+ * We have to insert write fence operations.) FIXME
*/
mapped_time_value_t *mtime = 0;
@@ -100,7 +99,9 @@ mapped_time_value_t *mtime = 0;
MACRO_BEGIN \
if (mtime != 0) { \
mtime->check_seconds = (time)->seconds; \
+ asm volatile("":::"memory"); \
mtime->microseconds = (time)->microseconds; \
+ asm volatile("":::"memory"); \
mtime->seconds = (time)->seconds; \
} \
MACRO_END
@@ -512,7 +513,7 @@ int timeclose()
/*
* Compatibility for device drivers.
* New code should use set_timeout/reset_timeout and private timers.
- * These code can't use a zone to allocate timers, because
+ * These code can't use a cache to allocate timers, because
* it can be called from interrupt handlers.
*/