diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-08 08:41:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-08 08:41:52 +0200 |
| commit | 2b3061c77ce7e429b25a25560ba088e8e7193a67 (patch) | |
| tree | 0266198d083a4a489cb3d8f47394b7b83263d212 /arch/x86/kernel/apic/x2apic_cluster.c | |
| parent | 01175255fd8e3e993353a779f819ec8c0c59137e (diff) | |
| parent | 25dfe4785332723f09311dcb7fd91015a60c022f (diff) | |
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_cluster.c')
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_cluster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c index 54f35d988025..200af5ae9662 100644 --- a/arch/x86/kernel/apic/x2apic_cluster.c +++ b/arch/x86/kernel/apic/x2apic_cluster.c @@ -227,7 +227,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask, cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu)); } -static struct apic apic_x2apic_cluster = { +static struct apic apic_x2apic_cluster __ro_after_init = { .name = "cluster x2apic", .probe = x2apic_cluster_probe, |