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]
/
arch
/
cris
/
kernel
/
time.c
diff --git
a/arch/cris/kernel/time.c
b/arch/cris/kernel/time.c
index
6c28b0e
..
66ba889
100644
(file)
--- a/
arch/cris/kernel/time.c
+++ b/
arch/cris/kernel/time.c
@@
-1,4
+1,4
@@
-/* $Id: time.c,v 1.1
4 2004/06/01 05:38:11
starvik Exp $
+/* $Id: time.c,v 1.1
8 2005/03/04 08:16:17
starvik Exp $
*
* linux/arch/cris/kernel/time.c
*
*
* linux/arch/cris/kernel/time.c
*
@@
-30,10
+30,8
@@
#include <linux/bcd.h>
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/bcd.h>
#include <linux/timex.h>
#include <linux/init.h>
-
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
+#include <linux/profile.h>
+#include <linux/sched.h> /* just for sched_clock() - funny that */
int have_rtc; /* used to remember if we have an RTC or not */;
int have_rtc; /* used to remember if we have an RTC or not */;
@@
-113,10
+111,7
@@
int do_settimeofday(struct timespec *tv)
set_normalized_timespec(&xtime, sec, nsec);
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
set_normalized_timespec(&xtime, sec, nsec);
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
- time_adjust = 0; /* stop active adjtime() */
- time_status |= STA_UNSYNC;
- time_maxerror = NTP_PHASE_LIMIT;
- time_esterror = NTP_PHASE_LIMIT;
+ ntp_clear();
write_sequnlock_irq(&xtime_lock);
clock_was_set();
return 0;
write_sequnlock_irq(&xtime_lock);
clock_was_set();
return 0;
@@
-214,6
+209,21
@@
update_xtime_from_cmos(void)
}
}
}
}
+extern void cris_profile_sample(struct pt_regs* regs);
+
+void
+cris_do_profile(struct pt_regs* regs)
+{
+
+#if CONFIG_SYSTEM_PROFILER
+ cris_profile_sample(regs);
+#endif
+
+#if CONFIG_PROFILING
+ profile_tick(CPU_PROFILING, regs);
+#endif
+}
+
/*
* Scheduler clock - returns current time in nanosec units.
*/
/*
* Scheduler clock - returns current time in nanosec units.
*/