diff options
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clockevents.c | 1 | ||||
-rw-r--r-- | kernel/time/tick-broadcast.c | 3 | ||||
-rw-r--r-- | kernel/time/tick-common.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 0e3a8448e115..89e394caa769 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
@@ -357,6 +357,7 @@ void clockevents_exchange_device(struct clock_event_device *old, | |||
357 | * released list and do a notify add later. | 357 | * released list and do a notify add later. |
358 | */ | 358 | */ |
359 | if (old) { | 359 | if (old) { |
360 | module_put(old->owner); | ||
360 | clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED); | 361 | clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED); |
361 | list_del(&old->list); | 362 | list_del(&old->list); |
362 | list_add(&old->list, &clockevents_released); | 363 | list_add(&old->list, &clockevents_released); |
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 3500caaa0bfd..0e374cd2e0ef 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/profile.h> | 19 | #include <linux/profile.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
22 | #include <linux/module.h> | ||
22 | 23 | ||
23 | #include "tick-internal.h" | 24 | #include "tick-internal.h" |
24 | 25 | ||
@@ -73,6 +74,8 @@ void tick_install_broadcast_device(struct clock_event_device *dev) | |||
73 | tick_broadcast_device.evtdev->rating >= dev->rating) || | 74 | tick_broadcast_device.evtdev->rating >= dev->rating) || |
74 | (dev->features & CLOCK_EVT_FEAT_C3STOP)) | 75 | (dev->features & CLOCK_EVT_FEAT_C3STOP)) |
75 | return; | 76 | return; |
77 | if (!try_module_get(dev->owner)) | ||
78 | return; | ||
76 | 79 | ||
77 | clockevents_exchange_device(tick_broadcast_device.evtdev, dev); | 80 | clockevents_exchange_device(tick_broadcast_device.evtdev, dev); |
78 | if (cur) | 81 | if (cur) |
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 84c7cfca4d7d..433a1e11d13b 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/percpu.h> | 18 | #include <linux/percpu.h> |
19 | #include <linux/profile.h> | 19 | #include <linux/profile.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/module.h> | ||
21 | 22 | ||
22 | #include <asm/irq_regs.h> | 23 | #include <asm/irq_regs.h> |
23 | 24 | ||
@@ -257,6 +258,9 @@ void tick_check_new_device(struct clock_event_device *newdev) | |||
257 | goto out_bc; | 258 | goto out_bc; |
258 | } | 259 | } |
259 | 260 | ||
261 | if (!try_module_get(newdev->owner)) | ||
262 | return; | ||
263 | |||
260 | /* | 264 | /* |
261 | * Replace the eventually existing device by the new | 265 | * Replace the eventually existing device by the new |
262 | * device. If the current device is the broadcast device, do | 266 | * device. If the current device is the broadcast device, do |