linux-mips
[Top] [All Lists]

Re: [PATCH] MIPS: Add dummy definitions of HPAGE_SHIFT et al.

To: David Daney <ddaney.cavm@gmail.com>
Subject: Re: [PATCH] MIPS: Add dummy definitions of HPAGE_SHIFT et al.
From: Hillf Danton <dhillf@gmail.com>
Date: Thu, 24 Nov 2011 20:17:57 +0800
Cc: linux-mips@linux-mips.org, ralf@linux-mips.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=Gx6VzsFPNHKf0kpSOBm86eXBSQMjZ9Lj+1J9fnlMTo8=; b=FD0xrJ7/vmGV0QFsdchWkXy4bxDKMpxYbPfkMnxgMxs1qxROgqvjwNosRQfphUxBDt p8wEWHglBSzgY31bLxPJKuZ8wEk5Su+spCYXXEZfI1Pbh7KpDnUMQyIKFMWEoELQnhxB 5QEbfHRO9p7T6c/tdvMG/Db4b+RiQwHyhPiE0=
In-reply-to: <1321990924-14189-1-git-send-email-ddaney.cavm@gmail.com>
References: <1321990924-14189-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
On Wed, Nov 23, 2011 at 3:42 AM, David Daney <ddaney.cavm@gmail.com> wrote:
> From: David Daney <david.daney@cavium.com>
>
> In the case of !CONFIG_HUGETLB_PAGE we need dummy definitions of
> HPAGE_SHIFT, HPAGE_SIZE and HPAGE_MASK to be able to compile tlb-r4k.c
>
> Add these with a BUILD_BUG() to properly flag situations where they
> are improperly used.
>
> Also conditionally define BUILD_BUG(), as the definition for this may
> not have been merged by the time this patch is merged.  Once a
> BUILD_BUG() is defined in kernel.h, we can remove this one.
>
> Cc: Hillf Danton <dhillf@gmail.com>
> Signed-off-by: David Daney <david.daney@cavium.com>
> ---

Acked-by: Hillf Danton <dhillf@gmail.com>

>  arch/mips/include/asm/page.h |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
> index e59cd1a..d417909 100644
> --- a/arch/mips/include/asm/page.h
> +++ b/arch/mips/include/asm/page.h
> @@ -38,6 +38,14 @@
>  #define HPAGE_SIZE     (_AC(1,UL) << HPAGE_SHIFT)
>  #define HPAGE_MASK     (~(HPAGE_SIZE - 1))
>  #define HUGETLB_PAGE_ORDER     (HPAGE_SHIFT - PAGE_SHIFT)
> +#else /* !CONFIG_HUGETLB_PAGE */
> +# ifndef BUILD_BUG
> +#  define BUILD_BUG() do { extern void __build_bug(void); __build_bug(); } 
> while (0)
> +# endif
> +#define HPAGE_SHIFT    ({BUILD_BUG(); 0; })
> +#define HPAGE_SIZE     ({BUILD_BUG(); 0; })
> +#define HPAGE_MASK     ({BUILD_BUG(); 0; })
> +#define HUGETLB_PAGE_ORDER     ({BUILD_BUG(); 0; })
>  #endif /* CONFIG_HUGETLB_PAGE */
>
>  #ifndef __ASSEMBLY__
> --
> 1.7.2.3
>
>

<Prev in Thread] Current Thread [Next in Thread>