Skip to content

L
linux-davinci
Commit 25c47bb3 authored by Rusty Russell's avatar Rusty Russell
Browse files
Options

lguest: use defines from x86 headers instead of magic numbers 

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent db24e8c2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
arch/x86/lguest/boot.c
View file @ 25c47bb3
...@@ -371,8 +371,7 @@ static void lguest_cpuid(unsigned int *eax, unsigned int *ebx, ...@@ -371,8 +371,7 @@ static void lguest_cpuid(unsigned int *eax, unsigned int *ebx,
static unsigned long current_cr0, current_cr3; static unsigned long current_cr0, current_cr3;
static void lguest_write_cr0(unsigned long val) static void lguest_write_cr0(unsigned long val)
{ {
/* 8 == TS bit. */ lazy_hcall(LHCALL_TS, val & X86_CR0_TS, 0, 0);
lazy_hcall(LHCALL_TS, val & 8, 0, 0);
current_cr0 = val; current_cr0 = val;
} }
...@@ -387,7 +386,7 @@ static unsigned long lguest_read_cr0(void) ...@@ -387,7 +386,7 @@ static unsigned long lguest_read_cr0(void)
static void lguest_clts(void) static void lguest_clts(void)
{ {
lazy_hcall(LHCALL_TS, 0, 0, 0); lazy_hcall(LHCALL_TS, 0, 0, 0);
current_cr0 &= ~8U; current_cr0 &= ~X86_CR0_TS;
} }
/* CR2 is the virtual address of the last page fault, which the Guest only ever /* CR2 is the virtual address of the last page fault, which the Guest only ever
......
drivers/lguest/x86/core.c
View file @ 25c47bb3
...@@ -562,7 +562,7 @@ void lguest_arch_setup_regs(struct lguest *lg, unsigned long start) ...@@ -562,7 +562,7 @@ void lguest_arch_setup_regs(struct lguest *lg, unsigned long start)
* is supposed to always be "1". Bit 9 (0x200) controls whether * is supposed to always be "1". Bit 9 (0x200) controls whether
* interrupts are enabled. We always leave interrupts enabled while * interrupts are enabled. We always leave interrupts enabled while
* running the Guest. */ * running the Guest. */
regs->eflags = 0x202; regs->eflags = X86_EFLAGS_IF | 0x2;
/* The "Extended Instruction Pointer" register says where the Guest is /* The "Extended Instruction Pointer" register says where the Guest is
* running. */ * running. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment