* [PATCH] Fix HPAGE_SIZE redifinition
@ 2009-07-14 13:37 Atsushi Nemoto
2009-07-14 15:46 ` David Daney
2009-08-04 18:27 ` Ralf Baechle
0 siblings, 2 replies; 3+ messages in thread
From: Atsushi Nemoto @ 2009-07-14 13:37 UTC (permalink / raw)
To: linux-mips; +Cc: ralf
This patch fixes warnings like this:
CC fs/proc/meminfo.o
In file included from /work/linux/include/linux/mmzone.h:20,
from /work/linux/include/linux/gfp.h:4,
from /work/linux/include/linux/mm.h:8,
from /work/linux/fs/proc/meminfo.c:5:
/work/linux/arch/mips/include/asm/page.h:36:1: warning: "HPAGE_SIZE" redefined
In file included from /work/linux/fs/proc/meminfo.c:2:
/work/linux/include/linux/hugetlb.h:107:1: warning: this is the location of the previous definition
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
arch/mips/include/asm/page.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
index 96a14a4..4320239 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -32,10 +32,12 @@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
+#ifdef CONFIG_HUGETLB_PAGE
#define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3)
#define HPAGE_SIZE ((1UL) << HPAGE_SHIFT)
#define HPAGE_MASK (~(HPAGE_SIZE - 1))
#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
+#endif /* CONFIG_HUGETLB_PAGE */
#ifndef __ASSEMBLY__
--
1.5.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix HPAGE_SIZE redifinition
2009-07-14 13:37 [PATCH] Fix HPAGE_SIZE redifinition Atsushi Nemoto
@ 2009-07-14 15:46 ` David Daney
2009-08-04 18:27 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: David Daney @ 2009-07-14 15:46 UTC (permalink / raw)
To: Atsushi Nemoto, ralf; +Cc: linux-mips
Atsushi Nemoto wrote:
> This patch fixes warnings like this:
> CC fs/proc/meminfo.o
> In file included from /work/linux/include/linux/mmzone.h:20,
> from /work/linux/include/linux/gfp.h:4,
> from /work/linux/include/linux/mm.h:8,
> from /work/linux/fs/proc/meminfo.c:5:
> /work/linux/arch/mips/include/asm/page.h:36:1: warning: "HPAGE_SIZE" redefined
> In file included from /work/linux/fs/proc/meminfo.c:2:
> /work/linux/include/linux/hugetlb.h:107:1: warning: this is the location of the previous definition
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: David Daney <ddaney@caviumnetworks.com>
> ---
> arch/mips/include/asm/page.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
> index 96a14a4..4320239 100644
> --- a/arch/mips/include/asm/page.h
> +++ b/arch/mips/include/asm/page.h
> @@ -32,10 +32,12 @@
> #define PAGE_SIZE (1UL << PAGE_SHIFT)
> #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))
>
> +#ifdef CONFIG_HUGETLB_PAGE
> #define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3)
> #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT)
> #define HPAGE_MASK (~(HPAGE_SIZE - 1))
> #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
> +#endif /* CONFIG_HUGETLB_PAGE */
>
> #ifndef __ASSEMBLY__
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix HPAGE_SIZE redifinition
2009-07-14 13:37 [PATCH] Fix HPAGE_SIZE redifinition Atsushi Nemoto
2009-07-14 15:46 ` David Daney
@ 2009-08-04 18:27 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2009-08-04 18:27 UTC (permalink / raw)
To: Atsushi Nemoto; +Cc: linux-mips
On Tue, Jul 14, 2009 at 10:37:09PM +0900, Atsushi Nemoto wrote:
Thanks, applied.
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-04 18:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-14 13:37 [PATCH] Fix HPAGE_SIZE redifinition Atsushi Nemoto
2009-07-14 15:46 ` David Daney
2009-08-04 18:27 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).