diff options
| author | Tejun Heo <[email protected]> | 2011-07-12 09:58:09 +0200 |
|---|---|---|
| committer | H. Peter Anvin <[email protected]> | 2011-07-13 16:36:01 -0700 |
| commit | 1f5026a7e21e409c2b9dd54f6dfb9446511fb7c5 (patch) | |
| tree | bcf0529d5f05ea8b685d6c0fddcb3197c2fab49c /include/linux/memblock.h | |
| parent | 348968eb151e2569ad0ebe19b2f9c3c25b5c816a (diff) | |
memblock: Kill MEMBLOCK_ERROR
25818f0f28 (memblock: Make MEMBLOCK_ERROR be 0) thankfully made
MEMBLOCK_ERROR 0 and there already are codes which expect error return
to be 0. There's no point in keeping MEMBLOCK_ERROR around. End its
misery.
Signed-off-by: Tejun Heo <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Cc: Yinghai Lu <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 4 |
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 @@ #define _LINUX_MEMBLOCK_H #ifdef __KERNEL__ -#define MEMBLOCK_ERROR 0 - #ifdef CONFIG_HAVE_MEMBLOCK /* * Logical memory blocks. @@ -164,7 +162,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo #else static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) { - return MEMBLOCK_ERROR; + return 0; } #endif /* CONFIG_HAVE_MEMBLOCK */ |