From ff7ad633917230cdb539cf01bfd22bd78b10100c Mon Sep 17 00:00:00 2001
From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Mon, 2 May 2011 02:26:23 +0900
Subject: [PATCH] --- yaml --- r: 248103 b: refs/heads/master c:
 adddcecf9222aa32938480cc1d03de629fab2a86 h: refs/heads/master i:   248101:
 0a6bc10766eb40b7f2124d2ca618500337c944c9   248099:
 edc7b30f98b3ea0ba89e56a683186e6b2a36719f   248095:
 4a2acc9249e8f01242e13499b5bdbffa7762c69c v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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;