Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250967
b: refs/heads/master
c: 95dde50
h: refs/heads/master
i:
  250965: 8eae63f
  250963: ac87bb3
  250959: efc9492
v: v3
  • Loading branch information
Yinghai Lu authored and Linus Torvalds committed May 25, 2011
1 parent 6fc0719 commit de43651
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9be9b90d6dc5e712ca5d6109691a8de753ce7f1
refs/heads/master: 95dde501907b06e7203c74f8435acfdab9eb2659
9 changes: 8 additions & 1 deletion trunk/include/linux/memblock.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define _LINUX_MEMBLOCK_H
#ifdef __KERNEL__

#define MEMBLOCK_ERROR 0

#ifdef CONFIG_HAVE_MEMBLOCK
/*
* Logical memory blocks.
Expand All @@ -20,7 +22,6 @@
#include <asm/memblock.h>

#define INIT_MEMBLOCK_REGIONS 128
#define MEMBLOCK_ERROR 0

struct memblock_region {
phys_addr_t base;
Expand Down Expand Up @@ -160,6 +161,12 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
#define __initdata_memblock
#endif

#else
static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align)
{
return MEMBLOCK_ERROR;
}

#endif /* CONFIG_HAVE_MEMBLOCK */

#endif /* __KERNEL__ */
Expand Down

0 comments on commit de43651

Please sign in to comment.