[Xen-changelog] [xen master] x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL

[patchbot@xxxxxxx]

commit 2eddc5d2dc18dfc161de7cd578a4be0d3479d9af
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Jan 19 12:17:24 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jan 19 12:17:24 2015 +0100

    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 <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
---
 extras/mini-os/arch/x86/x86_64.S |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S
index df3469e..72921b1 100644
--- a/extras/mini-os/arch/x86/x86_64.S
+++ b/extras/mini-os/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)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog