diff options
| author | Alexander Graf <agraf@suse.de> | 2013-02-13 12:56:14 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-02-13 12:56:14 +0100 |
| commit | dd92d6f2749c43ebab91c4762a1bc79e6523e936 (patch) | |
| tree | 6e6730bdd09284679c0861df6d0fcbec08ea7a87 /arch/x86/kvm/emulate.c | |
| parent | b9e3e208935e95ad62bd1b1bc4408c23a9ae3ada (diff) | |
| parent | b0da5bec30eca7ffbb2c89afa6fe503fd418d3a6 (diff) | |
Merge commit 'origin/next' into kvm-ppc-next
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index e99fb72cd4c..2b11318151a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1013,7 +1013,7 @@ static u8 test_cc(unsigned int condition, unsigned long flags) void (*fop)(void) = (void *)em_setcc + 4 * (condition & 0xf); flags = (flags & EFLAGS_MASK) | X86_EFLAGS_IF; - asm("pushq %[flags]; popf; call *%[fastop]" + asm("push %[flags]; popf; call *%[fastop]" : "=a"(rc) : [fastop]"r"(fop), [flags]"r"(flags)); return rc; } |