OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25818f0
)
memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK
author
Yinghai Lu
<yinghai@kernel.org>
Wed, 28 Jul 2010 05:28:21 +0000
(15:28 +1000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Thu, 5 Aug 2010 02:56:32 +0000
(12:56 +1000)
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
patch
|
blob
|
history
diff --git
a/include/linux/memblock.h
b/include/linux/memblock.h
index
dfa6449
..
c24b278
100644
(file)
--- 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
@@
static inline unsigned long memblock_region_pages(const struct memblock_region *
region++)
+#endif /* CONFIG_HAVE_MEMBLOCK */
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MEMBLOCK_H */