diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 06:03:17 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 06:03:17 -0500 |
commit | e2666d69068aba300d6c0dfe96489552f653be2a (patch) | |
tree | 07fa371d800deec45225589ebe6154dcc6c956b2 /tools | |
parent | d33f250af4e67d449f2c748b861ba99d50955469 (diff) | |
parent | ec02b076ceab63f99e5b3d80fd223d777266c236 (diff) |
Merge branch 'fortglx/4.5/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Get the core time(keeping) updates from John Stultz
- NTP robustness tweaks
- Another signed overflow nailed down
- More y2038 changes
- Stop alarmtimer after resume
- MAINTAINERS update
- Selftest fixes
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/timers/clocksource-switch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/timers/clocksource-switch.c b/tools/testing/selftests/timers/clocksource-switch.c index 627ec7425f78..fd88e3025bed 100644 --- a/tools/testing/selftests/timers/clocksource-switch.c +++ b/tools/testing/selftests/timers/clocksource-switch.c | |||
@@ -97,7 +97,7 @@ int get_cur_clocksource(char *buf, size_t size) | |||
97 | int change_clocksource(char *clocksource) | 97 | int change_clocksource(char *clocksource) |
98 | { | 98 | { |
99 | int fd; | 99 | int fd; |
100 | size_t size; | 100 | ssize_t size; |
101 | 101 | ||
102 | fd = open("/sys/devices/system/clocksource/clocksource0/current_clocksource", O_WRONLY); | 102 | fd = open("/sys/devices/system/clocksource/clocksource0/current_clocksource", O_WRONLY); |
103 | 103 | ||