Messages in this thread Patch in this message | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: build failure after merge of the pm tree | Date | Fri, 11 Nov 2011 13:27:58 +0100 |
| |
On Thursday, November 10, 2011, Stephen Rothwell wrote: > Hi Rafael, > > After merging the pm tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > mm/oom_kill.c: In function 'select_bad_process': > mm/oom_kill.c:326:5: error: implicit declaration of function 'thaw_process' > > Caused by commit 944e192db53c ("freezer: rename thaw_process() to > __thaw_task() and simplify the implementation"). > > I have used the pm tree from next-20111109 for today.
The appended patch fixes the build problem for me. I've added it to my linux-next branch already.
Tejun, please let me know if that's OK.
Rafael
--- From: Rafael J. Wysocki <rjw@sisk.pl> Subject: PM / Freezer: Fix fallout of thaw_process() -> __thaw_task() rename
The changset that renamed thaw_process() to __thaw_task() forgot to modify oom_kill.c in accordance with that change and introduced a build problem. Fix it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> --- mm/oom_kill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux/mm/oom_kill.c =================================================================== --- linux.orig/mm/oom_kill.c +++ linux/mm/oom_kill.c @@ -323,7 +323,7 @@ static struct task_struct *select_bad_pr */ if (test_tsk_thread_flag(p, TIF_MEMDIE)) { if (unlikely(frozen(p))) - thaw_process(p); + __thaw_task(p); return ERR_PTR(-1UL); } if (!p->mm)
| |