From f4939b75b020102c9ac996c106612b5d793e96c7 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 30 Aug 2004 20:31:19 -0700 Subject: [PATCH] [PATCH] prio-tree: remove function prototype inside function I had a problem when compiling a 2.6 kernel with gcc 3.5 CVS. The prototype for prio_tree_remove in mm/prio_tree.c is inside another function. gcc 3.5 gets upset and removes the function completely. Apparently this isnt valid C, so lets fix it up. Details can be found here: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17205 Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/prio_tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/prio_tree.c b/mm/prio_tree.c index a49ededace39a..2a1d02f933201 100644 --- a/mm/prio_tree.c +++ b/mm/prio_tree.c @@ -81,6 +81,8 @@ static inline unsigned long prio_tree_maxindex(unsigned int bits) return index_bits_to_maxindex[bits - 1]; } +static void prio_tree_remove(struct prio_tree_root *, struct prio_tree_node *); + /* * Extend a priority search tree so that it can store a node with heap_index * max_heap_index. In the worst case, this algorithm takes O((log n)^2). @@ -90,8 +92,6 @@ static inline unsigned long prio_tree_maxindex(unsigned int bits) static struct prio_tree_node *prio_tree_expand(struct prio_tree_root *root, struct prio_tree_node *node, unsigned long max_heap_index) { - static void prio_tree_remove(struct prio_tree_root *, - struct prio_tree_node *); struct prio_tree_node *first = NULL, *prev, *last = NULL; if (max_heap_index > prio_tree_maxindex(root->index_bits)) -- 2.53.0