diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /include/asm-x86_64/e820.h | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-x86_64/e820.h')
| -rw-r--r-- | include/asm-x86_64/e820.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h index 8e94edf0b984..e682edc24a68 100644 --- a/include/asm-x86_64/e820.h +++ b/include/asm-x86_64/e820.h | |||
| @@ -51,6 +51,8 @@ extern int e820_mapped(unsigned long start, unsigned long end, unsigned type); | |||
| 51 | 51 | ||
| 52 | extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end); | 52 | extern void e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned long end); |
| 53 | extern void e820_setup_gap(void); | 53 | extern void e820_setup_gap(void); |
| 54 | extern unsigned long e820_hole_size(unsigned long start_pfn, | ||
| 55 | unsigned long end_pfn); | ||
| 54 | 56 | ||
| 55 | extern void __init parse_memopt(char *p, char **end); | 57 | extern void __init parse_memopt(char *p, char **end); |
| 56 | 58 | ||