diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-06-21 09:22:51 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-06-21 09:22:51 +0300 |
| commit | c7d6b5a22c00a19b513353469d89062264a7235f (patch) | |
| tree | e693b4d3cd596471a2516529d6ef5c3ed9efcbdc /kernel/time/alarmtimer.c | |
| parent | 86721ab63b61ef1dd7305308e4049f644703decf (diff) | |
| parent | 7c71feb0a6766c7c3a262e3cc33ae231f3953cb6 (diff) | |
| download | linux-c7d6b5a22c00a19b513353469d89062264a7235f.tar.xz | |
Merge branch 'fortglx/4.8/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull time(keeping) updates from John Stultz:
- Handle the 1ns issue with the old refusing to die vsyscall machinery
- More y2038 updates
- Documentation fixes
- Simplify clocksource handling
Diffstat (limited to 'kernel/time/alarmtimer.c')
| -rw-r--r-- | kernel/time/alarmtimer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index e840ed867a5d..c3aad685bbc0 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -30,7 +30,6 @@ * struct alarm_base - Alarm timer bases * @lock: Lock for syncrhonized access to the base * @timerqueue: Timerqueue head managing the list of events - * @timer: hrtimer used to schedule events while running * @gettime: Function to read the time correlating to the base * @base_clockid: clockid for the base */ |