From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: build failure after merge of the final tree (pm tree related)
Date: Thu, 24 Nov 2011 17:19:49 +1100 [thread overview]
Message-ID: <20111124171949.994860621f4f83a650cf9b5b@canb.auug.org.au> (raw)
In-Reply-To: <201111150012.56306.rjw@sisk.pl>
[-- Attachment #1: Type: text/plain, Size: 2348 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-11-24 6:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-14 3:24 linux-next: build failure after merge of the final tree (pm tree related) Stephen Rothwell
2011-11-14 23:12 ` Rafael J. Wysocki
2011-11-24 6:19 ` Stephen Rothwell [this message]
2011-11-24 6:32 ` Tejun Heo
2011-11-24 10:15 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2012-10-24 3:44 Stephen Rothwell
2012-10-24 3:58 ` Song, Youquan
2012-10-24 21:40 ` Rafael J. Wysocki
2011-12-22 5:28 Stephen Rothwell
2011-12-23 0:32 ` Rafael J. Wysocki
2011-08-19 3:03 Stephen Rothwell
2011-08-19 8:14 ` Pihet-XID, Jean
2011-08-19 13:39 ` Stephen Rothwell
2011-08-19 20:33 ` Randy Dunlap
2011-08-19 21:58 ` Rafael J. Wysocki
2011-08-20 7:50 ` Pihet-XID, Jean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111124171949.994860621f4f83a650cf9b5b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).