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 tag 'v4.8-rc1' into patchwork
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
machine_kexec.c
diff --git
a/arch/ia64/kernel/machine_kexec.c
b/arch/ia64/kernel/machine_kexec.c
index b72cd7a07222696978c64b33f3e86bf38b70fd19..599507bcec91fc577147cf97d894fe7f6dd11677 100644
(file)
--- a/
arch/ia64/kernel/machine_kexec.c
+++ b/
arch/ia64/kernel/machine_kexec.c
@@
-163,7
+163,7
@@
void arch_crash_save_vmcoreinfo(void)
#endif
}
-
unsigned long
paddr_vmcoreinfo_note(void)
+
phys_addr_t
paddr_vmcoreinfo_note(void)
{
return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note);
}