diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-04 17:43:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-04 17:43:45 +0200 |
| commit | 1c3333600b0ebca94edffb3bb431c78687dc3d36 (patch) | |
| tree | 798b72afb270e98bbe434443510415c49e671a97 /drivers | |
| parent | Merge tag 'dm-4.8-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/d... (diff) | |
| parent | tick/nohz: Fix softlockup on scheduler stalls in kvm guest (diff) | |
| download | linux-1c3333600b0ebca94edffb3bb431c78687dc3d36.tar.xz linux-1c3333600b0ebca94edffb3bb431c78687dc3d36.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two fixlet from the timers departement:
- A fix for scheduler stalls in the tick idle code affecting
NOHZ_FULL kernels
- A trivial compile fix"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick/nohz: Fix softlockup on scheduler stalls in kvm guest
clocksource/drivers/atmel-pit: Fix compilation error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index 3494bc5a21d5..7f0f5b26d8c5 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c @@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) static int __init at91sam926x_pit_dt_init(struct device_node *node) { struct pit_data *data; + int ret; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) |