lkml.org 
[lkml]   [2011]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: build failure after merge of the final tree (pm tree related)
    Hi Rafael,

    On Tue, 15 Nov 2011 00:12:56 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
    >
    > On Monday, November 14, 2011, Stephen Rothwell wrote:
    > >
    > > After merging the final tree, today's linux-next build (powerpc
    > > allnoconfig) failed like this:
    > >
    > > mm/oom_kill.c: In function 'select_bad_process':
    > > mm/oom_kill.c:326:5: error: implicit declaration of function '__thaw_task' [-Werror=implicit-function-declaration]
    > >
    > > Caused by commit 23527e313ca5 ("PM / Freezer: Fix fallout of thaw_process()
    > > -> __thaw_task() rename"). __thaw_task() is only declared id
    > > CONFIG_FREEZER is set. Commit 944e192db53c ("freezer: rename thaw_process()
    > > to __thaw_task() and simplify the implementation") removed the second
    > > declaration of thaw_process() without replacing it ...
    > >
    > > I have added this patch for today:
    > >
    > > From: Stephen Rothwell <sfr@canb.auug.org.au>
    > > Date: Mon, 14 Nov 2011 14:19:32 +1100
    > > Subject: [PATCH] freezer: fix more fallout from the thaw_process rename
    > >
    > > Commit 944e192db53c "freezer: rename thaw_process() to __thaw_task()
    > > and simplify the implementation" did not create a !CONFIG_FREEZER version
    > > of __thaw_task().
    > >
    > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    >
    > I've applied your patch to linux-pm/pm-freezer and merged it into
    > linux-pm/linux-next.
    >
    > Thanks,
    > Rafael
    >
    > > ---
    > > include/linux/freezer.h | 1 +
    > > 1 files changed, 1 insertions(+), 0 deletions(-)
    > >
    > > diff --git a/include/linux/freezer.h b/include/linux/freezer.h
    > > index cc779bb..a9dccc6 100644
    > > --- a/include/linux/freezer.h
    > > +++ b/include/linux/freezer.h
    > > @@ -166,6 +166,7 @@ static inline bool set_freezable_with_signal(void)
    > > #else /* !CONFIG_FREEZER */
    > > static inline bool frozen(struct task_struct *p) { return false; }
    > > static inline bool freezing(struct task_struct *p) { return false; }
    > > +static inline void __thaw_task(struct task_struct *t) {}
    > >
    > > static inline bool __refrigerator(bool check_kthr_stop) { return false; }
    > > static inline int freeze_processes(void) { return -ENOSYS; }
    > >
    >

    This is back today, so I have applied the above patch again.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-11-24 07:23    [W:0.022 / U:29.816 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site