diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/memblock.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/include/asm/memblock.h')
| -rw-r--r-- | arch/x86/include/asm/memblock.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h new file mode 100644 index 000000000000..0cd3800f33b9 --- /dev/null +++ b/arch/x86/include/asm/memblock.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | #ifndef _X86_MEMBLOCK_H | ||
| 2 | #define _X86_MEMBLOCK_H | ||
| 3 | |||
| 4 | #define ARCH_DISCARD_MEMBLOCK | ||
| 5 | |||
| 6 | u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align); | ||
| 7 | |||
| 8 | void memblock_x86_reserve_range(u64 start, u64 end, char *name); | ||
| 9 | void memblock_x86_free_range(u64 start, u64 end); | ||
| 10 | struct range; | ||
| 11 | int __get_free_all_memory_range(struct range **range, int nodeid, | ||
| 12 | unsigned long start_pfn, unsigned long end_pfn); | ||
| 13 | int get_free_all_memory_range(struct range **rangep, int nodeid); | ||
| 14 | |||
| 15 | void memblock_x86_register_active_regions(int nid, unsigned long start_pfn, | ||
| 16 | unsigned long last_pfn); | ||
| 17 | u64 memblock_x86_hole_size(u64 start, u64 end); | ||
| 18 | u64 memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align); | ||
| 19 | u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit); | ||
| 20 | u64 memblock_x86_memory_in_range(u64 addr, u64 limit); | ||
| 21 | bool memblock_x86_check_reserved_size(u64 *addrp, u64 *sizep, u64 align); | ||
| 22 | |||
| 23 | #endif | ||