summaryrefslogtreecommitdiffstats
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/memblock.h')
-rw-r--r--include/linux/memblock.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 7525e38c434d..d235ec5fe678 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -2,8 +2,6 @@
2#define _LINUX_MEMBLOCK_H 2#define _LINUX_MEMBLOCK_H
3#ifdef __KERNEL__ 3#ifdef __KERNEL__
4 4
5#define MEMBLOCK_ERROR 0
6
7#ifdef CONFIG_HAVE_MEMBLOCK 5#ifdef CONFIG_HAVE_MEMBLOCK
8/* 6/*
9 * Logical memory blocks. 7 * Logical memory blocks.
@@ -164,7 +162,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
164#else 162#else
165static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) 163static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align)
166{ 164{
167 return MEMBLOCK_ERROR; 165 return 0;
168} 166}
169 167
170#endif /* CONFIG_HAVE_MEMBLOCK */ 168#endif /* CONFIG_HAVE_MEMBLOCK */