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/setup_percpu.c | |
| parent | sched: Remove __schedule() non-standard frame annotation (diff) | |
| parent | x86/mm/64: Enable KASLR for vmemmap memory region (diff) | |
| download | linux-dev-2b3061c77ce7e429b25a25560ba088e8e7193a67.tar.xz linux-dev-2b3061c77ce7e429b25a25560ba088e8e7193a67.zip | |
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.c | 2 |
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); |