kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mel Gorman <mgorman@suse.de>
To: kernel-janitors@vger.kernel.org
Subject: Re: [next:akpm 121/309] include/linux/page-flags.h:462:2: error: implicit declaration of function 'V
Date: Tue, 31 Jul 2012 10:24:06 +0000	[thread overview]
Message-ID: <20120731102406.GM612@suse.de> (raw)
In-Reply-To: <20120722163512.GC13376@localhost>

On Mon, Jul 30, 2012 at 04:48:14PM +0000, Luck, Tony wrote:
> >> Looks like include/linux/page-flags.h (which uses VM_BUG_ON) needs to have a
> >> 
> >> #include <linux/mmdebug.h>
> >> 
> >> to make sure it sees the define.
> >> 
> >
> > There should be a patch in-flight to Andrew's tree that fixes this.
> 
> Can you check ... it is still broken in linux-next today (tag = next-20120730)
> 

I can, and it looks like it got lost. I had to litter Andrew's inbox with
a number of build fixes so it's my own fault.

Andrew, can you pick this patch up please? It's a fix for the patch
"mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages". When merged,
it may collide with the patch immediately after it but the resolution is
straight-forward and the end result is the same. Thanks.

---8<---
buildfix: mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages

Fix build error for bisection reasons.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
---
 include/linux/page-flags.h |    1 +
 mm/slub.c                  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index e66eb0d..b5d1384 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -7,6 +7,7 @@
 
 #include <linux/types.h>
 #include <linux/bug.h>
+#include <linux/mmdebug.h>
 #ifndef __GENERATING_BOUNDS_H
 #include <linux/mm_types.h>
 #include <generated/bounds.h>
diff --git a/mm/slub.c b/mm/slub.c
index 7fcea20..50cc139 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2327,7 +2327,7 @@ redo:
 
 	object = c->freelist;
 	page = c->page;
-	if (unlikely(!object || !node_match(page, node)
+	if (unlikely(!object || !node_match(page, node) ||
 					!pfmemalloc_match(page, gfpflags)))
 		object = __slab_alloc(s, gfpflags, node, addr, c);
 

  parent reply	other threads:[~2012-07-31 10:24 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-22 16:35 [next:akpm 121/309] include/linux/page-flags.h:462:2: error: implicit declaration of function 'VM_BU Fengguang Wu
2012-07-24 21:07 ` [next:akpm 121/309] include/linux/page-flags.h:462:2: error: implicit declaration of function 'V Luck, Tony
2012-07-25  8:09 ` Mel Gorman
2012-07-30 16:48 ` Luck, Tony
2012-07-31 10:24 ` Mel Gorman [this message]
2012-07-31 19:10 ` Andrew Morton

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=20120731102406.GM612@suse.de \
    --to=mgorman@suse.de \
    --cc=kernel-janitors@vger.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).