From: Andrew Cooper Date: Mon, 19 Jan 2015 11:17:24 +0000 (+0100) Subject: x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f354651f364dc86e316b8459e092d492bc2d1923;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL MiniOS has never advertised support for supervisor_mode_kernel, and the feature was only ever implemented for 32bit Xen. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S index df3469e..72921b1 100644 --- a/arch/x86/x86_64.S +++ b/arch/x86/x86_64.S @@ -125,13 +125,10 @@ KERNEL_CS_MASK = 0xfc testl $NMI_MASK,2*8(%rsp) jnz 2f - testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) - jnz 1f - /* Direct iret to kernel space. Correct CS and SS. */ orb $3,1*8(%rsp) orb $3,4*8(%rsp) -1: iretq + iretq 2: /* Slow iret via hypervisor. */ andl $~NMI_MASK, 16(%rsp)