diff options
Diffstat (limited to 'arch/x86/include/asm/e820')
-rw-r--r-- | arch/x86/include/asm/e820/api.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/e820/types.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 4163a83f1a37..848b9f61808c 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -4,8 +4,8 @@ #include <asm/e820/types.h> /* see comment in arch/x86/kernel/e820.c */ -extern struct e820map *e820; -extern struct e820map *e820_saved; +extern struct e820_array *e820; +extern struct e820_array *e820_saved; extern unsigned long pci_mem_start; @@ -13,7 +13,7 @@ extern int e820_any_mapped(u64 start, u64 end, unsigned type); extern int e820_all_mapped(u64 start, u64 end, unsigned type); extern void e820_add_region(u64 start, u64 size, int type); extern void e820_print_map(char *who); -extern int sanitize_e820_map(struct e820entry *biosmap, int max_nr_map, u32 *pnr_map); +extern int sanitize_e820_map(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map); extern u64 e820_update_range(u64 start, u64 size, unsigned old_type, unsigned new_type); extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype); extern void update_e820(void); diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h index ce0e100b843c..05e25cabfafb 100644 --- a/arch/x86/include/asm/e820/types.h +++ b/arch/x86/include/asm/e820/types.h @@ -68,9 +68,9 @@ /* * The whole array of E820 entries: */ -struct e820map { +struct e820_array { __u32 nr_map; - struct e820entry map[E820_X_MAX]; + struct e820_entry map[E820_X_MAX]; }; /* |