projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
arch
/
s390
/
kernel
/
time.c
diff --git
a/arch/s390/kernel/time.c
b/arch/s390/kernel/time.c
index
7c0fe15
..
fea043b
100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-61,9
+61,18
@@
extern unsigned long wall_jiffies;
*/
unsigned long long sched_clock(void)
{
*/
unsigned long long sched_clock(void)
{
- return ((get_clock() - jiffies_timer_cc) * 1
000) >> 12
;
+ return ((get_clock() - jiffies_timer_cc) * 1
25) >> 9
;
}
}
+/*
+ * Monotonic_clock - returns # of nanoseconds passed since time_init()
+ */
+unsigned long long monotonic_clock(void)
+{
+ return sched_clock();
+}
+EXPORT_SYMBOL(monotonic_clock);
+
void tod_to_timeval(__u64 todval, struct timespec *xtime)
{
unsigned long long sec;
void tod_to_timeval(__u64 todval, struct timespec *xtime)
{
unsigned long long sec;