Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
xen
/
enlighten.c
diff --git
a/kernel/arch/x86/xen/enlighten.c
b/kernel/arch/x86/xen/enlighten.c
index
b7de78b
..
ffa4159
100644
(file)
--- a/
kernel/arch/x86/xen/enlighten.c
+++ b/
kernel/arch/x86/xen/enlighten.c
@@
-74,7
+74,6
@@
#include <asm/mach_traps.h>
#include <asm/mwait.h>
#include <asm/pci_x86.h>
#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
#include <asm/cpu.h>
#ifdef CONFIG_ACPI
@@
-961,7
+960,7
@@
static void xen_load_sp0(struct tss_struct *tss,
tss->x86_tss.sp0 = thread->sp0;
}
tss->x86_tss.sp0 = thread->sp0;
}
-
static
void xen_set_iopl_mask(unsigned mask)
+void xen_set_iopl_mask(unsigned mask)
{
struct physdev_set_iopl set_iopl;
{
struct physdev_set_iopl set_iopl;
@@
-1519,7
+1518,6
@@
asmlinkage __visible void __init xen_start_kernel(void)
{
struct physdev_set_iopl set_iopl;
unsigned long initrd_start = 0;
{
struct physdev_set_iopl set_iopl;
unsigned long initrd_start = 0;
- u64 pat;
int rc;
if (!xen_start_info)
int rc;
if (!xen_start_info)
@@
-1627,13
+1625,6
@@
asmlinkage __visible void __init xen_start_kernel(void)
xen_start_info->nr_pages);
xen_reserve_special_pages();
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
/* keep using Xen gdt for now; no urgent need to change it */
#ifdef CONFIG_X86_32