Re: 2.6.24-rc5-mm1

[Andrew Morton <akpm@linux-foundation.org>]

On Thu, 13 Dec 2007 17:58:02 +0530 Gautham R Shenoy <ego@in.ibm.com> wrote:

> Hi Andrew, 
> On Thu, Dec 13, 2007 at 02:40:50AM -0800, Andrew Morton wrote:
> > 
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.24-rc5/2.6.24-rc5-mm1/
> > 
> > - If something goes wrong with a PCI device's probing or initialisation, try
> >   reverting pci-disable-decoding-during-sizing-of-bars.patch.
> > 
> > - git-sched was dropped due to breaking suspend-to-RAM.
> 
> Is it the same suspend-to-RAM problem that Jiri Slaby reported 
> here --> http://lkml.org/lkml/2007/12/7/125
> 
> The problem has been identified and a fix patch was provided.
> 

Here we go...

From: Andrew Morton <akpm@linux-foundation.org>

Revert from git-sched:

commit 9e76ad89f4fa93a789326bc0f4548cd2fbca8d8e
Author: Gregory Haskins <ghaskins@novell.com>
Date:   Thu Dec 13 21:35:26 2007 +0100

    sched: update root-domain spans upon departure
    
    We shouldnt leave cpus enabled in the spans if that RQ has left the domain.
    
    Signed-off-by: Gregory Haskins <ghaskins@novell.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

As it causes my t61p to fail to come back to life after suspend-to-RAM.

Cc: Gautham R Shenoy <ego@in.ibm.com>
Cc: Gregory Haskins <ghaskins@novell.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sched.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN kernel/sched.c~revert-sched-update-root-domain-spans-upon-departure kernel/sched.c
--- a/kernel/sched.c~revert-sched-update-root-domain-spans-upon-departure
+++ a/kernel/sched.c
@@ -5854,9 +5854,6 @@ static void rq_attach_root(struct rq *rq
 				class->leave_domain(rq);
 		}
 
-		cpu_clear(rq->cpu, old_rd->span);
-		cpu_clear(rq->cpu, old_rd->online);
-
 		if (atomic_dec_and_test(&old_rd->refcount))
 			kfree(old_rd);
 	}
_