---

yaml --- r: 329884 b: refs/heads/master c: 0afbe2f h: refs/heads/master v: v3
git-mirror · Aug 27, 2012 · f7f4df1 · f7f4df1
1 parent 0015e2a
commit f7f4df1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5625189f6810ef79ced53989c794acfa10d3370
+refs/heads/master: 0afbe2f8781a812c7e501ec129eff45b21f792af
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -725,9 +725,9 @@ static int __linearize(struct x86_emulate_ctxt *ctxt,
 	return X86EMUL_CONTINUE;
 bad:
 	if (addr.seg == VCPU_SREG_SS)
-		return emulate_ss(ctxt, addr.seg);
+		return emulate_ss(ctxt, sel);
 	else
-		return emulate_gp(ctxt, addr.seg);
+		return emulate_gp(ctxt, sel);
 }
 
 static int linearize(struct x86_emulate_ctxt *ctxt,