aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
commit6918ea2484861cbf806c812b95a814ab40063c05 (patch)
tree3f4d53baabebad9339cadd1bbfaaf07ed61b9c1e /target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch
parentff6b0d57b8e4dd9c72b13ac0586c523c8d6e8841 (diff)
downloadupstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.gz
upstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.bz2
upstream-6918ea2484861cbf806c812b95a814ab40063c05.zip
brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0125-clockevents-Add-module-refcount.patch15
1 files changed, 11 insertions, 4 deletions
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 75f1c49ba3..3c85e62aa8 100644
--- 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
+