Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1554032 > unrolled thread

linux-next: build failure after merge of the akpm tree

Back to article view | Back to linux.kernel

Contents

  linux-next: build failure after merge of the akpm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-09 05:10 +0100

#1554032 — linux-next: build failure after merge of the akpm tree

Hi Andrew,

After merging the akpm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

lib/radix-tree.c: In function 'radix_tree_iter_delete':
lib/radix-tree.c:1952:3: error: too few arguments to function '__radix_tree_delete_node'
   __radix_tree_delete_node(root, node);
   ^
lib/radix-tree.c:1936:6: note: declared here
 void __radix_tree_delete_node(struct radix_tree_root *root,
      ^

Caused by patch

  "Reimplement IDR and IDA using the radix tree"

interacting with commit

  ea07b862ac8e ("mm: workingset: fix use-after-free in shadow node shrinker")

from Linus' tree.

I applied the following fixup patch (which may not be entirely complete,
of course).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Jan 2017 15:05:08 +1100
Subject: [PATCH] mm: merge fixup for "fix use-after-free in shadow node shrinker"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/radix-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index e563b5f50ace..4a8d206d508a 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1949,7 +1949,7 @@ void radix_tree_iter_delete(struct radix_tree_root *root,
 	if (node) {
 		node->slots[iter_offset(iter)] = NULL;
 		node->count--;
-		__radix_tree_delete_node(root, node);
+		__radix_tree_delete_node(root, node, NULL, NULL);
 	} else {
 		root->rnode = NULL;
 	}
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web