Re: mm: Fix page_end_pfn() implementations.

[KAMEZAWA Hiroyuki]

On Tue, 21 Jun 2011 21:11:41 -0700 (PDT)
David Miller <davem@xxxxxxxxxxxxx> wrote:

> 
> Commit 37573e8c718277103f61f03741bdc5606d31b07e ("memcg: fix
> init_page_cgroup nid with sparsemem") broke the build on sparc64
> because this is the first time the page_end_pfn() interface has
> actually been used in a long time, and sparc64's definition
> referes to ->node_end_pfn which doesn't even exist.
> 
> While fixing this I noticed powerpc had the same problem, and
> m32r's version had an off-by-one error.
> 
> These are all fixed here.
> 
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

Sorry, a patch is now queued in mmotm, as

http://marc.info/?l=linux-mm-commits&m=130834703319994&w=2

Thanks,
-Kame

> 
> diff --git a/arch/m32r/include/asm/mmzone.h b/arch/m32r/include/asm/mmzone.h
> index 9f3b5ac..31238e0 100644
> --- a/arch/m32r/include/asm/mmzone.h
> +++ b/arch/m32r/include/asm/mmzone.h
> @@ -18,7 +18,7 @@ extern struct pglist_data *node_data[];
>  #define node_end_pfn(nid)						\
>  ({									\
>  	pg_data_t *__pgdat = NODE_DATA(nid);				\
> -	__pgdat->node_start_pfn + __pgdat->node_spanned_pages - 1;	\
> +	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;		\
>  })
>  
>  #define pmd_page(pmd)		(pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
> diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
> index fd3fd58..86bf6ac 100644
> --- a/arch/powerpc/include/asm/mmzone.h
> +++ b/arch/powerpc/include/asm/mmzone.h
> @@ -43,7 +43,8 @@ u64 memory_hotplug_max(void);
>   */
>  
>  #define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
> -#define node_end_pfn(nid)	(NODE_DATA(nid)->node_end_pfn)
> +#define node_end_pfn(nid)       (NODE_DATA(nid)->node_start_pfn +	\
> +				 NODE_DATA(nid)->node_spanned_pages)
>  
>  #else
>  #define memory_hotplug_max() memblock_end_of_DRAM()
> diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h
> index e8c6487..a321b04 100644
> --- a/arch/sparc/include/asm/mmzone.h
> +++ b/arch/sparc/include/asm/mmzone.h
> @@ -9,7 +9,8 @@ extern struct pglist_data *node_data[];
>  
>  #define NODE_DATA(nid)		(node_data[nid])
>  #define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)
> -#define node_end_pfn(nid)	(NODE_DATA(nid)->node_end_pfn)
> +#define node_end_pfn(nid)       (NODE_DATA(nid)->node_start_pfn +	\
> +				 NODE_DATA(nid)->node_spanned_pages)
>  
>  extern int numa_cpu_lookup_table[];
>  extern cpumask_t numa_cpumask_lookup_table[];
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/