diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:00:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 22:00:51 -0800 |
| commit | f4cd87aabb51fcc709b0dacc05b718c400c64172 (patch) | |
| tree | b1710d9da7a42951db8c764f5101b68a45e369af /arch/ia64/kernel/efi.c | |
| parent | 271368b69b9e8042063d6c713423e84503bbdaa0 (diff) | |
| parent | e3a696e03c861f69627185dd235366b9a4403454 (diff) | |
| download | linux-f4cd87aabb51fcc709b0dacc05b718c400c64172.tar.bz2 | |
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] refresh config files
[IA64] put kdump_find_rsvd_region in __init
[IA64] Remove sparse warning from unwind code
[IA64] add missing syscall trace clear
[IA64] Cleanup in crash.c
[IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
[IA64] pci_get_legacy_ide_irq should return irq (not GSI)
[IA64] whitespace fixes for include/asm-ia64/sal.h
[IA64] Cache error recovery
[IA64] Proper handling of TLB errors from duplicate itr.d dropins
Diffstat (limited to 'arch/ia64/kernel/efi.c')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 49b93682c752..f45f91d38cab 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -1142,7 +1142,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, /* find a block of memory aligned to 64M exclude reserved regions rsvd_regions are sorted */ -unsigned long +unsigned long __init kdump_find_rsvd_region (unsigned long size, struct rsvd_region *r, int n) { |