diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 13:11:46 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 13:11:46 +0400 |
| commit | 90b4d60c6103105a634c495003c2ce931f075f63 (patch) | |
| tree | 033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /include/linux/memblock.h | |
| parent | bac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | linux-90b4d60c6103105a634c495003c2ce931f075f63.tar.xz | |
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 569d67d4243e..d452ee191066 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -57,6 +57,7 @@ int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_free(phys_addr_t base, phys_addr_t size); int memblock_reserve(phys_addr_t base, phys_addr_t size); +void memblock_trim_memory(phys_addr_t align); #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, |