git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/x86/kernel/acpi/boot.c
b/arch/x86/kernel/acpi/boot.c
index
803b684
..
dbe76a1
100644
(file)
--- a/
arch/x86/kernel/acpi/boot.c
+++ b/
arch/x86/kernel/acpi/boot.c
@@
-757,7
+757,7
@@
static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
}
/* wrapper to silence section mismatch warning */
-int __ref acpi_map_cpu(acpi_handle handle,
in
t physid, int *pcpu)
+int __ref acpi_map_cpu(acpi_handle handle,
phys_cpuid_
t physid, int *pcpu)
{
return _acpi_map_lsapic(handle, physid, pcpu);
}