diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-21 22:45:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-21 22:45:50 -0400 |
| commit | 8559840c4ca3f2fff73a882803bc8916078fac1f (patch) | |
| tree | e41f722a478d2e9f199398d4a766b004fd451ebc /include | |
| parent | 7e2f037b9226452de60a74e94e5c42d3e54c8637 (diff) | |
| parent | 58a69c367c02a165004a5ce5dd55ce03b59ba43d (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix wrong /proc/iomem on SGI Altix
[IA64] Altix: ioremap vga_console_iobase
[IA64] Fix typo/thinko in crash.c
[IA64] Fix get_model_name() for mixed cpu type systems
[IA64] min_low_pfn and max_low_pfn calculation fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/meminit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h index 21ec5f3d23de..3a62878e84f3 100644 --- a/include/asm-ia64/meminit.h +++ b/include/asm-ia64/meminit.h | |||
| @@ -36,6 +36,7 @@ extern void reserve_memory (void); | |||
| 36 | extern void find_initrd (void); | 36 | extern void find_initrd (void); |
| 37 | extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); | 37 | extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); |
| 38 | extern void efi_memmap_init(unsigned long *, unsigned long *); | 38 | extern void efi_memmap_init(unsigned long *, unsigned long *); |
| 39 | extern int find_max_min_low_pfn (unsigned long , unsigned long, void *); | ||
| 39 | 40 | ||
| 40 | extern unsigned long vmcore_find_descriptor_size(unsigned long address); | 41 | extern unsigned long vmcore_find_descriptor_size(unsigned long address); |
| 41 | extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end); | 42 | extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end); |