Patchwork -mOneiric SRU: Revert clockevents: Set noop handler in clockevents_exchange_device()

login
register
mail settings
Submitter Tim Gardner
Date Jan. 1, 2012, 9:52 p.m.
Message ID <20120101215234.DFBDEF88CF@lochsa.rtg.net>
Download mbox | patch
Permalink /patch/133768/
State New
Headers show

Comments

Tim Gardner - Jan. 1, 2012, 9:52 p.m.
From 3b87487ac5008072f138953b07505a7e3493327f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2011 13:24:40 -0800
Subject: [PATCH] Revert "clockevents: Set noop handler in clockevents_exchange_device()"

BugLink: http://bugs.launchpad.net/bugs/904569

This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.

It results in resume problems for various people. See for example

  http://thread.gmane.org/gmane.linux.kernel/1233033
  http://thread.gmane.org/gmane.linux.kernel/1233389
  http://thread.gmane.org/gmane.linux.kernel/1233159
  http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877

and the fedora and ubuntu bug reports

  https://bugzilla.redhat.com/show_bug.cgi?id=767248
  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569

which got bisected down to the stable version of this commit.

Reported-by: Jonathan Nieder <jrnieder@gmail.com>
Reported-by: Phil Miller <mille121@illinois.edu>
Reported-by: Philip Langdale <philipl@overt.org>
Reported-by: Tim Gardner <tim.gardner@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <gregkh@suse.de>
Cc: stable@kernel.org    # for stable kernels that applied the original
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 kernel/time/clockevents.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Brad Figg - Jan. 1, 2012, 9:56 p.m.
On 01/01/2012 01:52 PM, Tim Gardner wrote:
>  From 3b87487ac5008072f138953b07505a7e3493327f Mon Sep 17 00:00:00 2001
> From: Linus Torvalds<torvalds@linux-foundation.org>
> Date: Fri, 30 Dec 2011 13:24:40 -0800
> Subject: [PATCH] Revert "clockevents: Set noop handler in clockevents_exchange_device()"
>
> BugLink: http://bugs.launchpad.net/bugs/904569
>
> This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.
>
> It results in resume problems for various people. See for example
>
>    http://thread.gmane.org/gmane.linux.kernel/1233033
>    http://thread.gmane.org/gmane.linux.kernel/1233389
>    http://thread.gmane.org/gmane.linux.kernel/1233159
>    http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877
>
> and the fedora and ubuntu bug reports
>
>    https://bugzilla.redhat.com/show_bug.cgi?id=767248
>    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569
>
> which got bisected down to the stable version of this commit.
>
> Reported-by: Jonathan Nieder<jrnieder@gmail.com>
> Reported-by: Phil Miller<mille121@illinois.edu>
> Reported-by: Philip Langdale<philipl@overt.org>
> Reported-by: Tim Gardner<tim.gardner@canonical.com>
> Cc: Thomas Gleixner<tglx@linutronix.de>
> Cc: Greg KH<gregkh@suse.de>
> Cc: stable@kernel.org    # for stable kernels that applied the original
> Signed-off-by: Linus Torvalds<torvalds@linux-foundation.org>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
>   kernel/time/clockevents.c |    1 -
>   1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
> index c4eb71c..1ecd6ba 100644
> --- a/kernel/time/clockevents.c
> +++ b/kernel/time/clockevents.c
> @@ -387,7 +387,6 @@ void clockevents_exchange_device(struct clock_event_device *old,
>   	 * released list and do a notify add later.
>   	 */
>   	if (old) {
> -		old->event_handler = clockevents_handle_noop;
>   		clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED);
>   		list_del(&old->list);
>   		list_add(&old->list,&clockevents_released);

Acked-by: Brad Figg <brad.figg@canonical.com>
Tim Gardner - Jan. 1, 2012, 10:01 p.m.
On 01/01/2012 02:52 PM, Tim Gardner wrote:
>  From 3b87487ac5008072f138953b07505a7e3493327f Mon Sep 17 00:00:00 2001
> From: Linus Torvalds<torvalds@linux-foundation.org>
> Date: Fri, 30 Dec 2011 13:24:40 -0800
> Subject: [PATCH] Revert "clockevents: Set noop handler in clockevents_exchange_device()"
>
> BugLink: http://bugs.launchpad.net/bugs/904569
>
> This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.
>
> It results in resume problems for various people. See for example
>
>    http://thread.gmane.org/gmane.linux.kernel/1233033
>    http://thread.gmane.org/gmane.linux.kernel/1233389
>    http://thread.gmane.org/gmane.linux.kernel/1233159
>    http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877
>
> and the fedora and ubuntu bug reports
>
>    https://bugzilla.redhat.com/show_bug.cgi?id=767248
>    https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569
>
> which got bisected down to the stable version of this commit.
>
> Reported-by: Jonathan Nieder<jrnieder@gmail.com>
> Reported-by: Phil Miller<mille121@illinois.edu>
> Reported-by: Philip Langdale<philipl@overt.org>
> Reported-by: Tim Gardner<tim.gardner@canonical.com>
> Cc: Thomas Gleixner<tglx@linutronix.de>
> Cc: Greg KH<gregkh@suse.de>
> Cc: stable@kernel.org    # for stable kernels that applied the original
> Signed-off-by: Linus Torvalds<torvalds@linux-foundation.org>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
>   kernel/time/clockevents.c |    1 -
>   1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
> index c4eb71c..1ecd6ba 100644
> --- a/kernel/time/clockevents.c
> +++ b/kernel/time/clockevents.c
> @@ -387,7 +387,6 @@ void clockevents_exchange_device(struct clock_event_device *old,
>   	 * released list and do a notify add later.
>   	 */
>   	if (old) {
> -		old->event_handler = clockevents_handle_noop;
>   		clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED);
>   		list_del(&old->list);
>   		list_add(&old->list,&clockevents_released);

Patch

diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index c4eb71c..1ecd6ba 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -387,7 +387,6 @@  void clockevents_exchange_device(struct clock_event_device *old,
 	 * released list and do a notify add later.
 	 */
 	if (old) {
-		old->event_handler = clockevents_handle_noop;
 		clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED);
 		list_del(&old->list);
 		list_add(&old->list, &clockevents_released);