git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
efi.c
diff --git
a/arch/ia64/kernel/efi.c
b/arch/ia64/kernel/efi.c
index 3f7ea13358e952366eeef347a208facb92d5e57f..6216eba2e38f2a5293683e501827fcf9490a5ab9 100644
(file)
--- a/
arch/ia64/kernel/efi.c
+++ b/
arch/ia64/kernel/efi.c
@@
-1231,7
+1231,7
@@
kdump_find_rsvd_region (unsigned long size,
#ifdef CONFIG_PROC_VMCORE
/* locate the size find a the descriptor at a certain address */
-unsigned long
+unsigned long
__init
vmcore_find_descriptor_size (unsigned long address)
{
void *efi_map_start, *efi_map_end, *p;