Changeset 54802 in vbox

Timestamp:

Mar 17, 2015 8:32:43 AM (10 years ago)

Author:

vboxsync

Message:

another place where we have to handle SMAP

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/SUPDrv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)
• Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -48 +48 @@
 # include <iprt/power.h>
 # define VBOX_WITH_SUSPEND_NOTIFICATION
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
-# include <asm/smap.h>
-#else
-static inline void clac(void) { }
-static inline void stac(void) { }
 #endif
 

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -146 +146 @@
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
+# include <asm/smap.h>
+#else
+static inline void clac(void) { }
+static inline void stac(void) { }
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
 # ifndef page_to_pfn

trunk/src/VBox/Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c

@@ -90 +90 @@
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
+    stac();
     pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_PREEMPTING, pThis->pvUser);
+    clac();
 }
 
@@ -110 +112 @@
     Assert(pThis->fRegistered);
 
+    stac();
     pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_RESUMED, pThis->pvUser);
+    clac();
 }