brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/staging/dedeckeh.git] / target / linux / brcm2708 / patches-3.10 / 0125-clockevents-Add-module-refcount.patch

diff --git a/target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch b/target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch
index 75f1c49ba34442ae1f8ce5c03e7cdb11dd4a244a..3c85e62aa827108f851ad74c2cab6d6eb6eb2dbd 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch
+++ b/target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch
@@ -1,7 +1,7 @@
-From 38ca21f81217c14749f190f44709d4f5606ff798 Mon Sep 17 00:00:00 2001
+From a32b173c1e9039d2ce45a1bb8267bfdd33204461 Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Thu, 25 Apr 2013 20:31:49 +0000
-Subject: [PATCH 125/174] clockevents: Add module refcount
+Subject: [PATCH 125/196] clockevents: Add module refcount
 
 commit ccf33d6880f39a35158fff66db13000ae4943fac upstream.
 
@@ -21,9 +21,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  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(struc
+@@ -92,6 +92,8 @@ void tick_install_broadcast_device(struct clock_event_device *dev)
  
        if (!try_module_get(dev->owner))
                return;
@@ -32,9 +34,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        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_
+@@ -273,6 +273,9 @@ void tick_check_new_device(struct clock_event_device *newdev)
        if (!try_module_get(newdev->owner))
                return;
  
@@ -44,3 +48,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /*
         * Replace the eventually existing device by the new
         * device. If the current device is the broadcast device, do
+-- 
+1.9.1
+