debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/kernel-time.c @ 4615:58efb3448933

bitkeeper revision 1.1327.1.1 (426536d2PUqtjTi2v06bzD10RFwarg)

Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk
author xen-ia64.adm@bkbits.net
date Tue Apr 19 16:50:26 2005 +0000 (2005-04-19)
parents f1c946e1226a
children 5b9e241131fb
line source
1 time.c | 7 ++++++-
2 1 files changed, 6 insertions(+), 1 deletion(-)
4 Index: linux-2.6.11/kernel/time.c
5 ===================================================================
6 --- linux-2.6.11.orig/kernel/time.c 2005-03-02 01:37:50.000000000 -0600
7 +++ linux-2.6.11/kernel/time.c 2005-03-19 14:56:40.767870674 -0600
8 @@ -495,6 +495,7 @@ void getnstimeofday (struct timespec *tv
9 tv->tv_nsec = nsec;
10 }
12 +#ifndef XEN
13 int do_settimeofday (struct timespec *tv)
14 {
15 time_t wtm_sec, sec = tv->tv_sec;
16 @@ -503,7 +504,9 @@ int do_settimeofday (struct timespec *tv
17 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
18 return -EINVAL;
20 +#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
21 write_seqlock_irq(&xtime_lock);
22 +#endif
23 {
24 /*
25 * This is revolting. We need to set "xtime" correctly. However, the value
26 @@ -525,7 +528,9 @@ int do_settimeofday (struct timespec *tv
27 time_esterror = NTP_PHASE_LIMIT;
28 time_interpolator_reset();
29 }
30 +#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
31 write_sequnlock_irq(&xtime_lock);
32 +#endif
33 clock_was_set();
34 return 0;
35 }
36 @@ -552,7 +557,7 @@ void do_gettimeofday (struct timeval *tv
37 }
39 EXPORT_SYMBOL(do_gettimeofday);
40 -
41 +#endif
43 #else
44 /*