diff options
| -rw-r--r-- | arch/x86/kernel/e820_64.c | 22 | ||||
| -rw-r--r-- | include/asm-x86/e820_64.h | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c index cbd42e51cb08..79f0d52fa99a 100644 --- a/arch/x86/kernel/e820_64.c +++ b/arch/x86/kernel/e820_64.c | |||
| @@ -84,6 +84,28 @@ void __init reserve_early(unsigned long start, unsigned long end, char *name) | |||
| 84 | strncpy(r->name, name, sizeof(r->name) - 1); | 84 | strncpy(r->name, name, sizeof(r->name) - 1); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | void __init free_early(unsigned long start, unsigned long end) | ||
| 88 | { | ||
| 89 | struct early_res *r; | ||
| 90 | int i, j; | ||
| 91 | |||
| 92 | for (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) { | ||
| 93 | r = &early_res[i]; | ||
| 94 | if (start == r->start && end == r->end) | ||
| 95 | break; | ||
| 96 | } | ||
| 97 | if (i >= MAX_EARLY_RES || !early_res[i].end) | ||
| 98 | panic("free_early on not reserved area: %lx-%lx!", start, end); | ||
| 99 | |||
| 100 | for (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++) | ||
| 101 | ; | ||
| 102 | |||
| 103 | memcpy(&early_res[i], &early_res[i + 1], | ||
| 104 | (j - 1 - i) * sizeof(struct early_res)); | ||
| 105 | |||
| 106 | early_res[j - 1].end = 0; | ||
| 107 | } | ||
| 108 | |||
| 87 | void __init early_res_to_bootmem(void) | 109 | void __init early_res_to_bootmem(void) |
| 88 | { | 110 | { |
| 89 | int i; | 111 | int i; |
diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index f478c57eb060..b5e02e379af3 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h | |||
| @@ -48,6 +48,7 @@ extern struct e820map e820; | |||
| 48 | extern void update_e820(void); | 48 | extern void update_e820(void); |
| 49 | 49 | ||
| 50 | 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); |
| 51 | extern void free_early(unsigned long start, unsigned long end); | ||
| 51 | extern void early_res_to_bootmem(void); | 52 | extern void early_res_to_bootmem(void); |
| 52 | 53 | ||
| 53 | #endif/*!__ASSEMBLY__*/ | 54 | #endif/*!__ASSEMBLY__*/ |
