diff --git a/[refs] b/[refs] index afb04a036b43..6fceef25a9dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 509cf9fe11dad85f96944095ed63b2caa85cdfc9 +refs/heads/master: adddcecf9222aa32938480cc1d03de629fab2a86 diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c index c26243f6d668..d4f4375c0480 100644 --- a/trunk/arch/x86/kvm/emulate.c +++ b/trunk/arch/x86/kvm/emulate.c @@ -1351,8 +1351,7 @@ static void write_register_operand(struct operand *op) } } -static inline int writeback(struct x86_emulate_ctxt *ctxt, - struct x86_emulate_ops *ops) +static int writeback(struct x86_emulate_ctxt *ctxt) { int rc; struct decode_cache *c = &ctxt->decode; @@ -4089,7 +4088,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) goto done; writeback: - rc = writeback(ctxt, ops); + rc = writeback(ctxt); if (rc != X86EMUL_CONTINUE) goto done;