diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 21:09:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 21:09:13 -0400 |
commit | 5e1b834b27fb2c27cde33a0752425f11d10c0b2d (patch) | |
tree | 055c2c7165dcf0ccd73a273b16ad493ff48823a6 /drivers/clocksource/mips-gic-timer.c | |
parent | 49deffe0b0e4c2030696c7a6fd680bacf4761069 (diff) | |
parent | b536fd587044af02183b3c02690431b93154f0fa (diff) |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner:
"A rather smalish set of updates for timers and timekeeping:
- Two core fixes to prevent potential undefinded behaviour about
which gcc is complaining rightfully.
- A fix to prevent stopping the tick on an (soon) offline CPU so it
can complete the shutdown procedure.
- Wait for clocks to stabilize before making decisions, so a not yet
validated clock is not rejected.
- The usual pile of fixes to the various clocksource drivers.
- Core code typo and include fixlets"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Include the correct header for errno definitions
clocksource/drivers/ti-32k: Prevent ftrace recursion
clocksource/mips-gic-timer: Stop checking cpu_has_counter
clocksource/mips-gic-timer: Print an error if IRQ setup fails
tick/nohz: Prevent stopping the tick on an offline CPU
clocksource/drivers/oxnas: Add OX820 compatible
clocksource/drivers/timer-atmel-pit: Simplify IRQ handler
clocksource/drivers/timer-atmel-pit: Remove uselesss WARN_ON_ONCE
clocksource/drivers/timer-atmel-pit: Drop at91sam926x_pit_common_init
clocksource/drivers/moxart: Replace panic by pr_err
clocksource/drivers/moxart: Replace setup_irq by request_irq
clocksource/drivers/moxart: Add Aspeed support
clocksource/drivers/moxart: Use struct to hold state
clocksource/drivers/moxart: Refactor enable/disable
time: Avoid undefined behaviour in ktime_add_safe()
time: Avoid undefined behaviour in timespec64_add_safe()
timekeeping: Prints the amounts of time spent during suspend
clocksource: Defer override invalidation unless clock is unstable
hrtimer: Spelling fixes
Diffstat (limited to 'drivers/clocksource/mips-gic-timer.c')
-rw-r--r-- | drivers/clocksource/mips-gic-timer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index b4b3ab5a11ad..7a960cd01104 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c | |||
@@ -109,12 +109,15 @@ static int gic_clockevent_init(void) | |||
109 | { | 109 | { |
110 | int ret; | 110 | int ret; |
111 | 111 | ||
112 | if (!cpu_has_counter || !gic_frequency) | 112 | if (!gic_frequency) |
113 | return -ENXIO; | 113 | return -ENXIO; |
114 | 114 | ||
115 | ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction); | 115 | ret = setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction); |
116 | if (ret < 0) | 116 | if (ret < 0) { |
117 | pr_err("GIC timer IRQ %d setup failed: %d\n", | ||
118 | gic_timer_irq, ret); | ||
117 | return ret; | 119 | return ret; |
120 | } | ||
118 | 121 | ||
119 | cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING, | 122 | cpuhp_setup_state(CPUHP_AP_MIPS_GIC_TIMER_STARTING, |
120 | "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu, | 123 | "AP_MIPS_GIC_TIMER_STARTING", gic_starting_cpu, |