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.c | |
| parent | 01175255fd8e3e993353a779f819ec8c0c59137e (diff) | |
| parent | 25dfe4785332723f09311dcb7fd91015a60c022f (diff) | |
| download | op-kernel-dev-2b3061c77ce7e429b25a25560ba088e8e7193a67.zip op-kernel-dev-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.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0fa60f5..44c868e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -210,9 +210,9 @@ EXPORT_SYMBOL(boot_cpu_data); #if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) -__visible unsigned long mmu_cr4_features; +__visible unsigned long mmu_cr4_features __ro_after_init; #else -__visible unsigned long mmu_cr4_features = X86_CR4_PAE; +__visible unsigned long mmu_cr4_features __ro_after_init = X86_CR4_PAE; #endif /* Boot loader ID and version as integers, for the benefit of proc_dointvec */ |
