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 branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic
/
x2apic_uv_x.c
diff --git
a/arch/x86/kernel/apic/x2apic_uv_x.c
b/arch/x86/kernel/apic/x2apic_uv_x.c
index
832e908
..
6011593
100644
(file)
--- a/
arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/
arch/x86/kernel/apic/x2apic_uv_x.c
@@
-46,7
+46,7
@@
static int early_get_nodeid(void)
return node_id.s.node_id;
}
return node_id.s.node_id;
}
-static int uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static int
__init
uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
if (!strcmp(oem_id, "SGI")) {
if (!strcmp(oem_table_id, "UVL"))
{
if (!strcmp(oem_id, "SGI")) {
if (!strcmp(oem_table_id, "UVL"))
@@
-253,7
+253,7
@@
static void uv_send_IPI_self(int vector)
apic_write(APIC_SELF_IPI, vector);
}
apic_write(APIC_SELF_IPI, vector);
}
-struct apic apic_x2apic_uv_x = {
+struct apic
__refdata
apic_x2apic_uv_x = {
.name = "UV large system",
.probe = NULL,
.name = "UV large system",
.probe = NULL,