From: David Daney <ddaney@caviumnetworks.com>
To: Atsushi Nemoto <anemo@mba.ocn.ne.jp>, ralf@linux-mips.org
Cc: linux-mips@linux-mips.org
Subject: Re: [PATCH] Fix HPAGE_SIZE redifinition
Date: Tue, 14 Jul 2009 08:46:44 -0700 [thread overview]
Message-ID: <4A5CA864.90206@caviumnetworks.com> (raw)
In-Reply-To: <1247578629-23079-1-git-send-email-anemo@mba.ocn.ne.jp>
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__
>
next prev parent reply other threads:[~2009-07-14 15:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-14 13:37 [PATCH] Fix HPAGE_SIZE redifinition Atsushi Nemoto
2009-07-14 15:46 ` David Daney [this message]
2009-08-04 18:27 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A5CA864.90206@caviumnetworks.com \
--to=ddaney@caviumnetworks.com \
--cc=anemo@mba.ocn.ne.jp \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).