commit f0b37fad9a63217c39997b2d2b31f44e3d8be727
author Yinghai Lu <yinghai@kernel.org> Wed Jul 28 15:28:21 2010 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> Thu Aug 05 12:56:32 2010 +1000
tree ac98bee1b6f0a3d3c4f7907ddcbc11e81fd8c882
parent 25818f0f288cd5333ba5a90ad6dde3def4c4ff58

memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK

This should make it easier to catch/debug incorrect use when
the CONFIG_ option isn't set.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

include/linux/memblock.h

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index dfa6449..c24b278 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -2,6 +2,7 @@
 #define _LINUX_MEMBLOCK_H
 #ifdef __KERNEL__
 
+#ifdef CONFIG_HAVE_MEMBLOCK
 /*
  * Logical memory blocks.
  *
@@ -148,6 +149,8 @@
 	     region++)
 
 
+#endif /* CONFIG_HAVE_MEMBLOCK */
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_MEMBLOCK_H */