lkml.org 
[lkml]   [2011]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [GIT PULL pm/for-next] pm: freezer updates
    Date
    On Sunday, November 06, 2011, Tejun Heo wrote:
    > Hello, Rafael.
    >
    > On Sun, Nov 06, 2011 at 01:12:56PM +0100, Rafael J. Wysocki wrote:
    > > On Sunday, November 06, 2011, Rafael J. Wysocki wrote:
    > > > On Thursday, November 03, 2011, Tejun Heo wrote:
    > > > > Hello, Rafael.
    > > > >
    > > > > This is pull request for the following pending patches[ets].
    > > > >
    > > > > [1] freezer: fix various bugs and simplify implementation, take#2
    > > > > [2] usb_storage: don't use set_freezable_with_signal()
    > > > > [3] freezer: kill unused set_freezable_with_signal()
    > > > > [4] freezer: fix wait_event_freezable/__thaw_task races
    > > > >
    > > > > The patches are available in the git repository at:
    > > > >
    > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git pm-freezer
    > > >
    > > > I pulled this to linux-pm/pm-freezer, but there were merge conflicts that
    > > > I'm not 100% have been resolved correctly. Please double check if the
    > > > resulting branch is OK.
    > >
    > > I found a mismerge in the meantime, so the linux-pm/pm-freezer branch has
    > > been re-created from scratch. Please double check if it's correct.
    > >
    > > I intend to start merging it into linux-next after 3.2-rc1 has been released.
    >
    > fake_signal_wake_up() merging seems wrong. It should be calling
    > signal_wake_up() with @resume == 0. Other than that, everything looks
    > correct to me.

    Do you mean something like this is needed on top of linux-pm/pm-freezer:

    ---
    kernel/freezer.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    Index: linux-pm/kernel/freezer.c
    ===================================================================
    --- linux-pm.orig/kernel/freezer.c
    +++ linux-pm/kernel/freezer.c
    @@ -90,7 +90,7 @@ static void fake_signal_wake_up(struct t
    unsigned long flags;

    if (lock_task_sighand(p, &flags)) {
    - signal_wake_up(p, 1);
    + signal_wake_up(p, 0);
    unlock_task_sighand(p, &flags);
    }
    }

    \
     
     \ /
      Last update: 2011-11-06 22:09    [W:0.023 / U:65.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site