Revert "Minor compiling fix"

This reverts commit 0f9047bf8247df3eb20b991c0f472558a85aff9e.

diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 9348e1e..bca7e61 100644 (file)
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -99,5 +99,4 @@ AFLAGS_proc-v7.o      :=-Wa,-march=armv7-a
 obj-$(CONFIG_CACHE_FEROCEON_L2)        += cache-feroceon-l2.o
 obj-$(CONFIG_CACHE_L2X0)       += cache-l2x0.o
 obj-$(CONFIG_CACHE_XSC3L2)     += cache-xsc3l2.o
-obj-$(CONFIG_HUGETLB_PAGE)     += hugetlb.o
 obj-$(CONFIG_CACHE_TAUROS2)    += cache-tauros2.o

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 5d3b9e0..e1dd92c 100644 (file)
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -152,6 +152,9 @@ static struct arm_vmregion_head consistent_head = {
        .vm_end         = CONSISTENT_END,
 };
 
+#ifdef CONFIG_HUGETLB_PAGE
+#error ARM Coherent DMA allocator does not (yet) support huge TLB
+#endif
 
 /*
  * Initialise the consistent memory allocation.