diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:19 +0200 |
| commit | d8d1c35139481ee8e292d91cd3fd35a6b3a316eb (patch) | |
| tree | 0a06b6c185e91bf14b22e7f526755e2ca80209bf /arch/x86/xen/enlighten.c | |
| parent | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (diff) | |
| parent | 1886297ce0c8d563a08c8a8c4c0b97743e06cd37 (diff) | |
| download | linux-d8d1c35139481ee8e292d91cd3fd35a6b3a316eb.tar.bz2 | |
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base
Conflicts:
arch/x86/include/asm/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ff2a2e6ef7af..9b8f1eacc110 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -75,7 +75,6 @@ #include <asm/mach_traps.h> #include <asm/mwait.h> #include <asm/pci_x86.h> -#include <asm/pat.h> #include <asm/cpu.h> #ifdef CONFIG_ACPI @@ -1511,7 +1510,6 @@ asmlinkage __visible void __init xen_start_kernel(void) { struct physdev_set_iopl set_iopl; unsigned long initrd_start = 0; - u64 pat; int rc; if (!xen_start_info) @@ -1618,13 +1616,6 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_start_info->nr_pages); xen_reserve_special_pages(); - /* - * Modify the cache mode translation tables to match Xen's PAT - * configuration. - */ - rdmsrl(MSR_IA32_CR_PAT, pat); - pat_init_cache_modes(pat); - /* keep using Xen gdt for now; no urgent need to change it */ #ifdef CONFIG_X86_32 |