Re: [patch] fix unused setup_nr_node_ids
> That doesn't do much to inprove overall readability. > > I suspect the warning was only there because the stubbed version of > setup_nr_node_ids() forgot to be declared static inline, yes? > > How about this? Yes, looks good. Thanks, Miklos - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] fix unused setup_nr_node_ids
On Fri, 18 May 2007 12:39:14 +0200 Miklos Szeredi <[EMAIL PROTECTED]> wrote: > This is now the only (!) compiler warning I get in my UML build :) > > > From: Miklos Szeredi <[EMAIL PROTECTED]> > > mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used > > Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]> > --- > > Index: linux/mm/page_alloc.c > === > --- linux.orig/mm/page_alloc.c2007-04-26 13:07:11.0 +0200 > +++ linux/mm/page_alloc.c 2007-04-26 13:07:12.0 +0200 > @@ -914,7 +914,10 @@ static int rmqueue_bulk(struct zone *zon > #if MAX_NUMNODES > 1 > int nr_node_ids __read_mostly = MAX_NUMNODES; > EXPORT_SYMBOL(nr_node_ids); > +#endif > > +#ifdef CONFIG_ARCH_POPULATES_NODE_MAP > +#if MAX_NUMNODES > 1 > /* > * Figure out the number of possible node ids. > */ > @@ -930,6 +933,7 @@ static void __init setup_nr_node_ids(voi > #else > static void __init setup_nr_node_ids(void) {} > #endif > +#endif > > #ifdef CONFIG_NUMA > /* That doesn't do much to inprove overall readability. I suspect the warning was only there because the stubbed version of setup_nr_node_ids() forgot to be declared static inline, yes? How about this? --- a/mm/page_alloc.c~fix-unused-setup_nr_node_ids +++ a/mm/page_alloc.c @@ -136,6 +136,11 @@ static unsigned long __meminitdata dma_r #endif /* CONFIG_MEMORY_HOTPLUG_RESERVE */ #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ +#if MAX_NUMNODES > 1 +int nr_node_ids __read_mostly = MAX_NUMNODES; +EXPORT_SYMBOL(nr_node_ids); +#endif + #ifdef CONFIG_DEBUG_VM static int page_outside_zone_boundaries(struct zone *zone, struct page *page) { @@ -669,26 +674,6 @@ static int rmqueue_bulk(struct zone *zon return i; } -#if MAX_NUMNODES > 1 -int nr_node_ids __read_mostly = MAX_NUMNODES; -EXPORT_SYMBOL(nr_node_ids); - -/* - * Figure out the number of possible node ids. - */ -static void __init setup_nr_node_ids(void) -{ - unsigned int node; - unsigned int highest = 0; - - for_each_node_mask(node, node_possible_map) - highest = node; - nr_node_ids = highest + 1; -} -#else -static void __init setup_nr_node_ids(void) {} -#endif - #ifdef CONFIG_NUMA /* * Called from the vmstat counter updater to drain pagesets of this @@ -2733,6 +2718,26 @@ void __meminit free_area_init_node(int n } #ifdef CONFIG_ARCH_POPULATES_NODE_MAP + +#if MAX_NUMNODES > 1 +/* + * Figure out the number of possible node ids. + */ +static void __init setup_nr_node_ids(void) +{ + unsigned int node; + unsigned int highest = 0; + + for_each_node_mask(node, node_possible_map) + highest = node; + nr_node_ids = highest + 1; +} +#else +static inline void setup_nr_node_ids(void) +{ +} +#endif + /** * add_active_range - Register a range of PFNs backed by physical memory * @nid: The node ID the range resides on _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[patch] fix unused setup_nr_node_ids
This is now the only (!) compiler warning I get in my UML build :) From: Miklos Szeredi <[EMAIL PROTECTED]> mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used Signed-off-by: Miklos Szeredi <[EMAIL PROTECTED]> --- Index: linux/mm/page_alloc.c === --- linux.orig/mm/page_alloc.c 2007-04-26 13:07:11.0 +0200 +++ linux/mm/page_alloc.c 2007-04-26 13:07:12.0 +0200 @@ -914,7 +914,10 @@ static int rmqueue_bulk(struct zone *zon #if MAX_NUMNODES > 1 int nr_node_ids __read_mostly = MAX_NUMNODES; EXPORT_SYMBOL(nr_node_ids); +#endif +#ifdef CONFIG_ARCH_POPULATES_NODE_MAP +#if MAX_NUMNODES > 1 /* * Figure out the number of possible node ids. */ @@ -930,6 +933,7 @@ static void __init setup_nr_node_ids(voi #else static void __init setup_nr_node_ids(void) {} #endif +#endif #ifdef CONFIG_NUMA /* Index: linux/drivers/base/core.c - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[patch] fix unused setup_nr_node_ids
This is now the only (!) compiler warning I get in my UML build :) From: Miklos Szeredi [EMAIL PROTECTED] mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used Signed-off-by: Miklos Szeredi [EMAIL PROTECTED] --- Index: linux/mm/page_alloc.c === --- linux.orig/mm/page_alloc.c 2007-04-26 13:07:11.0 +0200 +++ linux/mm/page_alloc.c 2007-04-26 13:07:12.0 +0200 @@ -914,7 +914,10 @@ static int rmqueue_bulk(struct zone *zon #if MAX_NUMNODES 1 int nr_node_ids __read_mostly = MAX_NUMNODES; EXPORT_SYMBOL(nr_node_ids); +#endif +#ifdef CONFIG_ARCH_POPULATES_NODE_MAP +#if MAX_NUMNODES 1 /* * Figure out the number of possible node ids. */ @@ -930,6 +933,7 @@ static void __init setup_nr_node_ids(voi #else static void __init setup_nr_node_ids(void) {} #endif +#endif #ifdef CONFIG_NUMA /* Index: linux/drivers/base/core.c - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] fix unused setup_nr_node_ids
On Fri, 18 May 2007 12:39:14 +0200 Miklos Szeredi [EMAIL PROTECTED] wrote: This is now the only (!) compiler warning I get in my UML build :) From: Miklos Szeredi [EMAIL PROTECTED] mm/page_alloc.c:931: warning: 'setup_nr_node_ids' defined but not used Signed-off-by: Miklos Szeredi [EMAIL PROTECTED] --- Index: linux/mm/page_alloc.c === --- linux.orig/mm/page_alloc.c2007-04-26 13:07:11.0 +0200 +++ linux/mm/page_alloc.c 2007-04-26 13:07:12.0 +0200 @@ -914,7 +914,10 @@ static int rmqueue_bulk(struct zone *zon #if MAX_NUMNODES 1 int nr_node_ids __read_mostly = MAX_NUMNODES; EXPORT_SYMBOL(nr_node_ids); +#endif +#ifdef CONFIG_ARCH_POPULATES_NODE_MAP +#if MAX_NUMNODES 1 /* * Figure out the number of possible node ids. */ @@ -930,6 +933,7 @@ static void __init setup_nr_node_ids(voi #else static void __init setup_nr_node_ids(void) {} #endif +#endif #ifdef CONFIG_NUMA /* That doesn't do much to inprove overall readability. I suspect the warning was only there because the stubbed version of setup_nr_node_ids() forgot to be declared static inline, yes? How about this? --- a/mm/page_alloc.c~fix-unused-setup_nr_node_ids +++ a/mm/page_alloc.c @@ -136,6 +136,11 @@ static unsigned long __meminitdata dma_r #endif /* CONFIG_MEMORY_HOTPLUG_RESERVE */ #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ +#if MAX_NUMNODES 1 +int nr_node_ids __read_mostly = MAX_NUMNODES; +EXPORT_SYMBOL(nr_node_ids); +#endif + #ifdef CONFIG_DEBUG_VM static int page_outside_zone_boundaries(struct zone *zone, struct page *page) { @@ -669,26 +674,6 @@ static int rmqueue_bulk(struct zone *zon return i; } -#if MAX_NUMNODES 1 -int nr_node_ids __read_mostly = MAX_NUMNODES; -EXPORT_SYMBOL(nr_node_ids); - -/* - * Figure out the number of possible node ids. - */ -static void __init setup_nr_node_ids(void) -{ - unsigned int node; - unsigned int highest = 0; - - for_each_node_mask(node, node_possible_map) - highest = node; - nr_node_ids = highest + 1; -} -#else -static void __init setup_nr_node_ids(void) {} -#endif - #ifdef CONFIG_NUMA /* * Called from the vmstat counter updater to drain pagesets of this @@ -2733,6 +2718,26 @@ void __meminit free_area_init_node(int n } #ifdef CONFIG_ARCH_POPULATES_NODE_MAP + +#if MAX_NUMNODES 1 +/* + * Figure out the number of possible node ids. + */ +static void __init setup_nr_node_ids(void) +{ + unsigned int node; + unsigned int highest = 0; + + for_each_node_mask(node, node_possible_map) + highest = node; + nr_node_ids = highest + 1; +} +#else +static inline void setup_nr_node_ids(void) +{ +} +#endif + /** * add_active_range - Register a range of PFNs backed by physical memory * @nid: The node ID the range resides on _ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] fix unused setup_nr_node_ids
That doesn't do much to inprove overall readability. I suspect the warning was only there because the stubbed version of setup_nr_node_ids() forgot to be declared static inline, yes? How about this? Yes, looks good. Thanks, Miklos - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/