path: root/include/linux/memblock.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-02 15:49:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-02 15:49:46 -0700
commitf219764920c3d235713566013375cc01decd3d49 (patch)
treef36613f5fb6e1c3bec82110d55927594cfa74ea7 /include/linux/memblock.h
parente6e6d074369c839e84071c3b056adf20ead8da6e (diff)
parentd6c9708737c2107c38bd75f133d14d5801b8d6d5 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "15 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: scripts/gdb: make lx-dmesg command work (reliably) mm: consider memblock reservations for deferred memory initialization sizing mm/hugetlb: report -EHWPOISON not -EFAULT when FOLL_HWPOISON is specified mlock: fix mlock count can not decrease in race condition mm/migrate: fix refcount handling when !hugepage_migration_supported() dax: fix race between colliding PMD & PTE entries mm: avoid spurious 'bad pmd' warning messages mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once pcmcia: remove left-over %Z format slub/memcg: cure the brainless abuse of sysfs attributes initramfs: fix disabling of initramfs (and its compression) mm: clarify why we want kmalloc before falling backto vmallock frv: declare jiffies to be located in the .data section include/linux/gfp.h: fix ___GFP_NOLOCKDEP value ksm: prevent crash after write_protect_page fails
Diffstat (limited to 'include/linux/memblock.h')
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)
+extern unsigned long memblock_reserved_memory_within(phys_addr_t start_addr,
+ phys_addr_t end_addr);
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 /* __KERNEL__ */