On Wed, Nov 23, 2011 at 3:42 AM, David Daney <ddaney.cavm@xxxxxxxxx> wrote:
> From: David Daney <david.daney@xxxxxxxxxx>
>
> 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@xxxxxxxxx>
> Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
> ---
Acked-by: Hillf Danton <dhillf@xxxxxxxxx>
> 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
>
>
