diff options
Diffstat (limited to 'include/asm-x86/e820_64.h')
-rw-r--r-- | include/asm-x86/e820_64.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index 22ede73ae724..71c4d685d30d 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h | |||
@@ -14,20 +14,24 @@ | |||
14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
15 | 15 | ||
16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
17 | extern unsigned long find_e820_area(unsigned long start, unsigned long end, | 17 | extern unsigned long find_e820_area(unsigned long start, unsigned long end, |
18 | unsigned size, unsigned long align); | 18 | unsigned long size, unsigned long align); |
19 | extern void add_memory_region(unsigned long start, unsigned long size, | 19 | extern unsigned long find_e820_area_size(unsigned long start, |
20 | unsigned long *sizep, | ||
21 | unsigned long align); | ||
22 | extern void add_memory_region(unsigned long start, unsigned long size, | ||
20 | int type); | 23 | int type); |
21 | extern void update_memory_range(u64 start, u64 size, unsigned old_type, | 24 | extern void update_memory_range(u64 start, u64 size, unsigned old_type, |
22 | unsigned new_type); | 25 | unsigned new_type); |
23 | extern void setup_memory_region(void); | 26 | extern void setup_memory_region(void); |
24 | extern void contig_e820_setup(void); | 27 | extern void contig_e820_setup(void); |
25 | extern unsigned long e820_end_of_ram(void); | 28 | extern unsigned long e820_end_of_ram(void); |
26 | extern void e820_reserve_resources(struct resource *code_resource, | 29 | extern void e820_reserve_resources(void); |
27 | struct resource *data_resource, struct resource *bss_resource); | ||
28 | extern void e820_mark_nosave_regions(void); | 30 | extern void e820_mark_nosave_regions(void); |
29 | extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type); | 31 | extern int e820_any_mapped(unsigned long start, unsigned long end, |
30 | extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type); | 32 | unsigned type); |
33 | extern int e820_all_mapped(unsigned long start, unsigned long end, | ||
34 | unsigned type); | ||
31 | extern int e820_any_non_reserved(unsigned long start, unsigned long end); | 35 | extern int e820_any_non_reserved(unsigned long start, unsigned long end); |
32 | extern int is_memory_any_valid(unsigned long start, unsigned long end); | 36 | extern int is_memory_any_valid(unsigned long start, unsigned long end); |
33 | extern int e820_all_non_reserved(unsigned long start, unsigned long end); | 37 | extern int e820_all_non_reserved(unsigned long start, unsigned long end); |
@@ -35,8 +39,8 @@ extern int is_memory_all_valid(unsigned long start, unsigned long end); | |||
35 | extern unsigned long e820_hole_size(unsigned long start, unsigned long end); | 39 | extern unsigned long e820_hole_size(unsigned long start, unsigned long end); |
36 | 40 | ||
37 | extern void e820_setup_gap(void); | 41 | extern void e820_setup_gap(void); |
38 | extern void e820_register_active_regions(int nid, | 42 | extern void e820_register_active_regions(int nid, unsigned long start_pfn, |
39 | unsigned long start_pfn, unsigned long end_pfn); | 43 | unsigned long end_pfn); |
40 | 44 | ||
41 | extern void finish_e820_parsing(void); | 45 | extern void finish_e820_parsing(void); |
42 | 46 | ||
@@ -44,7 +48,8 @@ extern struct e820map e820; | |||
44 | extern void update_e820(void); | 48 | extern void update_e820(void); |
45 | 49 | ||
46 | extern void reserve_early(unsigned long start, unsigned long end, char *name); | 50 | extern void reserve_early(unsigned long start, unsigned long end, char *name); |
47 | extern void early_res_to_bootmem(void); | 51 | extern void free_early(unsigned long start, unsigned long end); |
52 | extern void early_res_to_bootmem(unsigned long start, unsigned long end); | ||
48 | 53 | ||
49 | #endif/*!__ASSEMBLY__*/ | 54 | #endif/*!__ASSEMBLY__*/ |
50 | 55 | ||