summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2019-02-21 14:51:22 -0800
committerMatt Turner <mattst88@gmail.com>2020-01-13 22:25:39 +0000
commitbb405cdc85b6e31c0beef60a07a2cfe5b87dcde6 (patch)
treea0daf7dd81eb0230a39415e49b974b686202da0c
parent977f3acfceb91f1dd10c8bf84b9d7515b2a59457 (diff)
os-support/solaris: Drop ExtendedEnabled global variable
Keeping track of kernel state in user space doesn't buy us anything, and introduces bugs, as we were keeping global state but the Solaris kernel tracks IOPL per thread. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> (cherry picked from commit 7533fa9bd5a4a0f7743d553be186514d684308c8)
-rw-r--r--hw/xfree86/os-support/solaris/sun_vid.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 25f76181c..9601d039b 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -73,22 +73,14 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
/* I/O Permissions section */
/***************************************************************************/
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-static Bool ExtendedEnabled = FALSE;
-#endif
-
Bool
xf86EnableIO(void)
{
#if defined(__i386__) || defined(__i386) || defined(__x86)
- if (ExtendedEnabled)
- return TRUE;
-
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
return FALSE;
}
- ExtendedEnabled = TRUE;
#endif /* i386 */
return TRUE;
}
@@ -97,11 +89,6 @@ void
xf86DisableIO(void)
{
#if defined(__i386__) || defined(__i386) || defined(__x86)
- if (!ExtendedEnabled)
- return;
-
sysi86(SI86V86, V86SC_IOPL, 0);
-
- ExtendedEnabled = FALSE;
#endif /* i386 */
}