summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic/x2apic_uv_x.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-09-08 06:41:52 (GMT)
committerIngo Molnar <mingo@kernel.org>2016-09-08 06:41:52 (GMT)
commit2b3061c77ce7e429b25a25560ba088e8e7193a67 (patch)
tree0266198d083a4a489cb3d8f47394b7b83263d212 /arch/x86/kernel/apic/x2apic_uv_x.c
parent01175255fd8e3e993353a779f819ec8c0c59137e (diff)
parent25dfe4785332723f09311dcb7fd91015a60c022f (diff)
downloadlinux-2b3061c77ce7e429b25a25560ba088e8e7193a67.tar.xz
Merge branch 'x86/mm' into x86/asm, to unify the two branches for simplicity
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
-rw-r--r--arch/x86/kernel/apic/x2apic_uv_x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index cb0673c..b9f6157 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -560,7 +560,7 @@ static int uv_probe(void)
return apic == &apic_x2apic_uv_x;
}
-static struct apic __refdata apic_x2apic_uv_x = {
+static struct apic apic_x2apic_uv_x __ro_after_init = {
.name = "UV large system",
.probe = uv_probe,