Subject: [PATCH 125/196] clockevents: Add module refcount

From: Thomas Gleixner <[email-masked]>
Date: Thu, 25 Apr 2013 20:31:49 +0000

commit ccf33d6880f39a35158fff66db13000ae4943fac upstream.

We want to be able to remove clockevent modules as well. Add a
refcount so we don't remove a module with an active clock event
device.

Signed-off-by: Thomas Gleixner <[email-masked]>
Cc: John Stultz <[email-masked]>
Cc: Magnus Damm <[email-masked]>
Link: http://lkml.kernel.org/r/[email-masked]
Signed-off-by: Thomas Gleixner <[email-masked]>
Cc: Kim Phillips <[email-masked]>
Signed-off-by: Greg Kroah-Hartman <[email-masked]>
---
 kernel/time/tick-broadcast.c | 2 ++
 kernel/time/tick-common.c    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 19ee339..b219c9f 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -92,6 +92,8 @@ void tick_install_broadcast_device(struct clock_event_device *dev)
 
 	if (!try_module_get(dev->owner))
 		return;
+	if (!try_module_get(dev->owner))
+		return;
 
 	clockevents_exchange_device(cur, dev);
 	if (cur)
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 086216c..2dcea16 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -273,6 +273,9 @@ void tick_check_new_device(struct clock_event_device *newdev)
 	if (!try_module_get(newdev->owner))
 		return;
 
+	if (!try_module_get(newdev->owner))
+		return;
+
 	/*
 	 * Replace the eventually existing device by the new
 	 * device. If the current device is the broadcast device, do
-- 
1.9.1