diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:07:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:07:54 +0200 |
| commit | 73fa1362a7f337d149f76d26b6c6845cb38c1af9 (patch) | |
| tree | 8b66c4e1995515b366f3bbe1f908d8c214c27e06 /arch/x86/kernel/setup.c | |
| parent | x86/dump_pagetables: Add support for 5-level paging (diff) | |
| parent | x86/cpu: Drop wp_works_ok member of struct cpuinfo_x86 (diff) | |
| download | linux-dev-73fa1362a7f337d149f76d26b6c6845cb38c1af9.tar.xz linux-dev-73fa1362a7f337d149f76d26b6c6845cb38c1af9.zip | |
Merge branch 'x86/cpu' into x86/mm, before applying dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 56b1177155db..1302c47c5ce1 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -173,14 +173,11 @@ static struct resource bss_resource = { #ifdef CONFIG_X86_32 -/* cpu data as detected by the assembly code in head.S */ -struct cpuinfo_x86 new_cpu_data = { - .wp_works_ok = -1, -}; +/* cpu data as detected by the assembly code in head_32.S */ +struct cpuinfo_x86 new_cpu_data; + /* common cpu data for all cpus */ -struct cpuinfo_x86 boot_cpu_data __read_mostly = { - .wp_works_ok = -1, -}; +struct cpuinfo_x86 boot_cpu_data __read_mostly; EXPORT_SYMBOL(boot_cpu_data); unsigned int def_to_bigsmp; |