Re: [PATCH 4/5] hugetlb: add per node hstate attributes

[Mel Gorman <mel@csn.ul.ie>]

On Mon, Aug 24, 2009 at 03:29:02PM -0400, Lee Schermerhorn wrote:
> <SNIP>
>
> Index: linux-2.6.31-rc6-mmotm-090820-1918/include/linux/node.h
> ===================================================================
> --- linux-2.6.31-rc6-mmotm-090820-1918.orig/include/linux/node.h	2009-08-24 12:12:44.000000000 -0400
> +++ linux-2.6.31-rc6-mmotm-090820-1918/include/linux/node.h	2009-08-24 12:12:56.000000000 -0400
> @@ -21,9 +21,12 @@
>  
>  #include <linux/sysdev.h>
>  #include <linux/cpumask.h>
> +#include <linux/hugetlb.h>
>  

Is this header inclusion necessary? It does not appear to be required by
the structure modification (which is iffy in itself as discussed in the
earlier mail) and it breaks build on x86-64.

 CC      arch/x86/kernel/setup_percpu.o
In file included from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:62,
                 from include/linux/hugetlb.h:8,
                 from include/linux/node.h:24,
                 from include/linux/cpu.h:23,
                 from /usr/local/autobench/var/tmp/build/arch/x86/include/asm/cpu.h:5,
                 from arch/x86/kernel/setup_percpu.c:19:
include/linux/highmem.h:53: error: static declaration of kmap follows non-static declaration
/usr/local/autobench/var/tmp/build/arch/x86/include/asm/highmem.h:60: error: previous declaration of kmap was here
include/linux/highmem.h:59: error: static declaration of kunmap follows non-static declaration
/usr/local/autobench/var/tmp/build/arch/x86/include/asm/highmem.h:61: error: previous declaration of kunmap was here
include/linux/highmem.h:63: error: static declaration of kmap_atomic follows non-static declaration
/usr/local/autobench/var/tmp/build/arch/x86/include/asm/highmem.h:63: error: previous declaration of kmap_atomic was here
make[2]: *** [arch/x86/kernel/setup_percpu.o] Error 1
make[1]: *** [arch/x86/kernel] Error 2



>  struct node {
>  	struct sys_device	sysdev;
> +	struct kobject		*hugepages_kobj;
> +	struct kobject		*hstate_kobjs[HUGE_MAX_HSTATE];
>  };
>  
>  struct memory_block;
> 

-- 
Mel Gorman
Part-time Phd Student                          Linux Technology Center
University of Limerick                         IBM Dublin Software Lab