diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 19:21:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 19:21:19 +0200 |
| commit | cb098d50ecc0a4729507ddcc7f4ae98c3703fadd (patch) | |
| tree | 444db3ac525576f4ac3e9779c449e403eb5db4c6 /kernel/time | |
| parent | Merge tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | kdb: use memmove instead of overlapping memcpy (diff) | |
| download | linux-cb098d50ecc0a4729507ddcc7f4ae98c3703fadd.tar.xz linux-cb098d50ecc0a4729507ddcc7f4ae98c3703fadd.zip | |
Merge tag 'for_linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb
Pull kdb updates from Jason Wessel:
- fix 2032 time access issues and new compiler warnings
- minor regression test cleanup
- formatting fixes for end user use of kdb
* tag 'for_linus-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
kdb: use memmove instead of overlapping memcpy
kdb: use ktime_get_mono_fast_ns() instead of ktime_get_ts()
kdb: bl: don't use tab character in output
kdb: drop newline in unknown command output
kdb: make "mdr" command repeat
kdb: use __ktime_get_real_seconds instead of __current_kernel_time
misc: kgdbts: Display progress of asynchronous tests
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timekeeping_internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h index fdbeeb02dde9..cf5c0828ee31 100644 --- a/kernel/time/timekeeping_internal.h +++ b/kernel/time/timekeeping_internal.h @@ -31,6 +31,4 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask) } #endif -extern time64_t __ktime_get_real_seconds(void); - #endif /* _TIMEKEEPING_INTERNAL_H */ |