OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[uclinux-h8/linux.git]
/
include
/
linux
/
timekeeping.h
diff --git
a/include/linux/timekeeping.h
b/include/linux/timekeeping.h
index
3aa72e6
..
6e191e4
100644
(file)
--- a/
include/linux/timekeeping.h
+++ b/
include/linux/timekeeping.h
@@
-145,7
+145,6
@@
static inline void getboottime(struct timespec *ts)
}
#endif
-#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
#define ktime_get_real_ts64(ts) getnstimeofday64(ts)
/*