aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-08-25 16:39:18 -0400
committerH. Peter Anvin <hpa@zytor.com>2010-08-27 14:13:54 -0400
commit6f2a75369e7561e800d86927ecd83c970996b21f (patch)
tree558e90d291a6dfc17cd950805bf5f56cb2b690e1 /arch/x86/include
parenta587d2daebcd2bc159d4348b6a7b028950a6d803 (diff)
x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve
memblock_memory_size() will return memory size in memblock.memory.region. memblock_free_memory_size() will return free memory size in memblock.memory.region. So We can get exact reseved size in specified range. Set the size right after initmem_init(), because later bootmem API will get area above 16M. (except some fallback). Later after we remove the bootmem, We could call that just before paging_init(). Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/e820.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 718646384e03..5be1542fbfaf 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -117,6 +117,8 @@ extern unsigned long e820_end_of_low_ram_pfn(void);
117extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); 117extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);
118 118
119void memblock_x86_fill(void); 119void memblock_x86_fill(void);
120void memblock_find_dma_reserve(void);
121
120extern void finish_e820_parsing(void); 122extern void finish_e820_parsing(void);
121extern void e820_reserve_resources(void); 123extern void e820_reserve_resources(void);
122extern void e820_reserve_resources_late(void); 124extern void e820_reserve_resources_late(void);