diff --git a/hypervisor/arch/x86/guest/instr_emul.c b/hypervisor/arch/x86/guest/instr_emul.c
index 431066e18..d289dda36 100644
--- a/hypervisor/arch/x86/guest/instr_emul.c
+++ b/hypervisor/arch/x86/guest/instr_emul.c
@@ -2135,8 +2135,7 @@ decode_moffset(struct vie *vie)
 }
 
 int
-__decode_instruction(__unused struct vcpu *vcpu, __unused uint64_t gla,
-		enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
+__decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
 {
 	if (decode_prefixes(vie, cpu_mode, cs_d))
 		return -1;
diff --git a/hypervisor/arch/x86/guest/instr_emul.h b/hypervisor/arch/x86/guest/instr_emul.h
index cdff96e0f..cf60dc005 100644
--- a/hypervisor/arch/x86/guest/instr_emul.h
+++ b/hypervisor/arch/x86/guest/instr_emul.h
@@ -86,8 +86,8 @@ int vie_init(struct vie *vie, struct vcpu *vcpu);
  * in VIE_INVALID_GLA instead.
  */
 #define	VIE_INVALID_GLA		(1UL << 63)	/* a non-canonical address */
-int __decode_instruction(struct vcpu *vcpu, uint64_t gla,
-		enum vm_cpu_mode cpu_mode, int csd, struct vie *vie);
+int
+__decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie);
 
 int emulate_instruction(struct vcpu *vcpu);
 int decode_instruction(struct vcpu *vcpu);
diff --git a/hypervisor/arch/x86/guest/instr_emul_wrapper.c b/hypervisor/arch/x86/guest/instr_emul_wrapper.c
index 648ca20d0..1061017a2 100644
--- a/hypervisor/arch/x86/guest/instr_emul_wrapper.c
+++ b/hypervisor/arch/x86/guest/instr_emul_wrapper.c
@@ -331,8 +331,8 @@ int decode_instruction(struct vcpu *vcpu)
 	csar = exec_vmread(VMX_GUEST_CS_ATTR);
 	cpu_mode = get_vcpu_mode(vcpu);
 
-	retval = __decode_instruction(vcpu, guest_rip_gva,
-			cpu_mode, SEG_DESC_DEF32(csar), &emul_cnx->vie);
+	retval = __decode_instruction(cpu_mode, SEG_DESC_DEF32(csar),
+		&emul_cnx->vie);
 
 	if (retval != 0) {
 		pr_err("decode instruction failed @ 0x%016llx:",