[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170626165343.46285c95@canb.auug.org.au>
Date:   Mon, 26 Jun 2017 16:53:43 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        David Miller <davem@...emloft.net>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jag Raman <jag.raman@...cle.com>,
        Michal Hocko <mhocko@...e.com>
Subject: linux-next: build failure after merge of the akpm tree
Hi Andrew,
After merging the akpm tree, today's linux-next build (sparc64 defconfig)
failed like this:
arch/sparc/kernel/mdesc.c: In function 'mdesc_kmalloc':
arch/sparc/kernel/mdesc.c:208:48: error: '__GFP_REPEAT' undeclared (first use in this function)
  base = kmalloc(handle_size + 15, GFP_KERNEL | __GFP_REPEAT);
                                                ^
Caused by commit
  726ad49b664b ("mm, tree wide: replace __GFP_REPEAT by __GFP_RETRY_MAYFAIL with more useful semantic")
interacting with commit
  0ab2fcd69dbf ("sparc64: mdesc: use __GFP_REPEAT action modifier for VM allocation")
from the sparc-next tree.
For now I have applied the following (I expect it to be replaced with
something better):
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 26 Jun 2017 16:47:46 +1000
Subject: [PATCH] paper over the removal of __GFP_REPEAT for now
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 arch/sparc/kernel/mdesc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index e4b4e790bf89..c9ecd5abf5bf 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -205,7 +205,7 @@ static struct mdesc_handle *mdesc_kmalloc(unsigned int mdesc_size)
 	handle_size = (sizeof(struct mdesc_handle) -
 		       sizeof(struct mdesc_hdr) +
 		       mdesc_size);
-	base = kmalloc(handle_size + 15, GFP_KERNEL | __GFP_REPEAT);
+	base = kmalloc(handle_size + 15, GFP_KERNEL /* | __GFP_REPEAT */);
 	if (!base)
 		return NULL;
 
-- 
2.11.0
-- 
Cheers,
Stephen Rothwell
Powered by blists - more mailing lists
 
