[PATCH 1/4] Make update_mapped_time() take also the mapped time variable

[Pino Toscano]

* kern/mach_clock.c (update_mapped_time): Add a second parameter for the
mapped time variable, instead of harcoding it to `mtime'.
---
 kern/mach_clock.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 4ba7c08..af221f5 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -96,14 +96,14 @@ int         bigadj = 1000000;       /* adjust 10*tickadj if 
adjustment
 
 mapped_time_value_t *mtime = 0;
 
-#define update_mapped_time(time)                               \
+#define update_mapped_time(time, mtime)                                \
 MACRO_BEGIN                                                    \
-       if (mtime != 0) {                                       \
-               mtime->check_seconds = (time)->seconds;         \
+       if ((mtime) != 0) {                                     \
+               (mtime)->check_seconds = (time)->seconds;       \
                asm volatile("":::"memory");                    \
-               mtime->microseconds = (time)->microseconds;     \
+               (mtime)->microseconds = (time)->microseconds;   \
                asm volatile("":::"memory");                    \
-               mtime->seconds = (time)->seconds;               \
+               (mtime)->seconds = (time)->seconds;             \
        }                                                       \
 MACRO_END
 
@@ -234,7 +234,7 @@ void clock_interrupt(usec, usermode, basepri)
                }
                time_value_add_usec(&time, delta);
            }
-           update_mapped_time(&time);
+           update_mapped_time(&time, mtime);
 
            /*
             *  Schedule soft-interupt for timeout if needed
@@ -428,7 +428,7 @@ host_set_time(host, new_time)
 
        s = splhigh();
        time = new_time;
-       update_mapped_time(&time);
+       update_mapped_time(&time, mtime);
        resettodr();
        splx(s);
 
@@ -499,7 +499,7 @@ void mapable_time_init()
                                                != KERN_SUCCESS)
                panic("mapable_time_init");
        memset(mtime, 0, PAGE_SIZE);
-       update_mapped_time(&time);
+       update_mapped_time(&time, mtime);
 }
 
 int timeopen()
-- 
1.7.5.4