diff options
| author | Anton Blanchard <anton@samba.org> | 2004-08-30 20:31:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-30 20:31:19 -0700 |
| commit | f4939b75b020102c9ac996c106612b5d793e96c7 (patch) | |
| tree | 880a10802005c2efe3d8d5a31c25fbf20303e441 /mm | |
| parent | 129b71fc432037419f0c6c5a932893e1386db9af (diff) | |
| download | history-f4939b75b020102c9ac996c106612b5d793e96c7.tar.gz | |
[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 <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/prio_tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/prio_tree.c b/mm/prio_tree.c index a49ededace39ab..2a1d02f9332016 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)) |