diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:44 +0200 |
| commit | 95a8e746f82bdda5d8a443b6557c930782d65b86 (patch) | |
| tree | 6047fecc66e133c10d04be7b0bec89069c3e1654 /drivers/lguest/x86 | |
| parent | d8d1c35139481ee8e292d91cd3fd35a6b3a316eb (diff) | |
| parent | a3125494cff084b098c80bb36fbe2061ffed9d52 (diff) | |
| download | linux-95a8e746f82bdda5d8a443b6557c930782d65b86.tar.gz linux-95a8e746f82bdda5d8a443b6557c930782d65b86.tar.bz2 linux-95a8e746f82bdda5d8a443b6557c930782d65b86.zip | |
Merge branch 'x86/urgent' into x86/asm to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/lguest/x86')
| -rw-r--r-- | drivers/lguest/x86/core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c index 65f22debf3c6..6e9042e3d2a9 100644 --- a/drivers/lguest/x86/core.c +++ b/drivers/lguest/x86/core.c @@ -429,8 +429,12 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu) return; break; case 32 ... 255: + /* This might be a syscall. */ + if (could_be_syscall(cpu->regs->trapnum)) + break; + /* - * These values mean a real interrupt occurred, in which case + * Other values mean a real interrupt occurred, in which case * the Host handler has already been run. We just do a * friendly check if another process should now be run, then * return to run the Guest again. |