linux-mips
[Top] [All Lists]

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

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH] MIPS: Add dummy definitions of HPAGE_SHIFT et al.
From: David Daney <ddaney.cavm@gmail.com>
Date: Tue, 22 Nov 2011 11:42:04 -0800
Cc: David Daney <david.daney@cavium.com>, Hillf Danton <dhillf@gmail.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=Hx6/JesxcEkm07XuzOcEze8TzyKfU5np2Svz/5xZNYs=; b=gTwT0WexT34mdLoUd2LQtYiFsl4lhvInn5Yo1rXhBmvuQeV8xfNWXxtl97S9317pbs V5hFudbPgPqBNFMlUZqinAcnO5jGt03RUfUWd/IlpWkAD/1diH62+4L3D170h7uWWz7l GBGInwhCpXsJOrJOnRGf/rFWBpJhdr4rRIzpc=
Sender: linux-mips-bounce@linux-mips.org
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>
---
 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>