diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
| commit | 216fe8f021e33c36e3b27c49c9f1951f6b037d7f (patch) | |
| tree | a43daec41b4d3955e7a4f8d0ed0654a7c80527ec /include/linux/memblock.h | |
| parent | 9747e2313838ee8f5d8073fd6aa7289255c3c51b (diff) | |
| parent | b29794ec95c6856b316c2295904208bf11ffddd9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver
and the DSA core code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 4ce24a376262..8098695e5d8d 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -425,12 +425,20 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) } #endif +extern unsigned long memblock_reserved_memory_within(phys_addr_t start_addr, + phys_addr_t end_addr); #else static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) { return 0; } +static inline unsigned long memblock_reserved_memory_within(phys_addr_t start_addr, + phys_addr_t end_addr) +{ + return 0; +} + #endif /* CONFIG_HAVE_MEMBLOCK */ #endif /* __KERNEL__ */ |