aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup_percpu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-09-08 08:41:52 +0200
committerIngo Molnar <mingo@kernel.org>2016-09-08 08:41:52 +0200
commit2b3061c77ce7e429b25a25560ba088e8e7193a67 (patch)
tree0266198d083a4a489cb3d8f47394b7b83263d212 /arch/x86/kernel/setup_percpu.c
parent01175255fd8e3e993353a779f819ec8c0c59137e (diff)
parent25dfe4785332723f09311dcb7fd91015a60c022f (diff)
download96b-common-2b3061c77ce7e429b25a25560ba088e8e7193a67.tar.gz
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/setup_percpu.c')
-rw-r--r--arch/x86/kernel/setup_percpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index d182799c4264..2bbd27f89802 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -33,7 +33,7 @@ EXPORT_PER_CPU_SYMBOL(cpu_number);
DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
EXPORT_PER_CPU_SYMBOL(this_cpu_off);
-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
+unsigned long __per_cpu_offset[NR_CPUS] __ro_after_init = {
[0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
};
EXPORT_SYMBOL(__per_cpu_offset);