[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111114142423.fe126b8c8cfd275d7dd138cc@canb.auug.org.au>
Date: Mon, 14 Nov 2011 14:24:23 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Rafael J. Wysocki" <rjw@...k.pl>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Tejun Heo <tj@...nel.org>
Subject: linux-next: build failure after merge of the final tree (pm tree
related)
Hi Rafael,
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@...b.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@...b.auug.org.au>
---
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; }
--
1.7.7.2
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists