VirtualBox

Ticket #13961: diff_smap_2

File diff_smap_2, 2.1 KB (added by Frank Mehnert, 10 years ago)
Line 
1diff -u '--exclude=.svn' '--exclude=CVS' '--exclude=.*.d' '--exclude=.depend' '--exclude=.hdepend' '--exclude=.*.flags' -r a/vboxdrv/linux/SUPDrv-linux.c b/vboxdrv/linux/SUPDrv-linux.c
2--- a/vboxdrv/linux/SUPDrv-linux.c 2015-03-17 12:19:19.000000000 +0100
3+++ b/vboxdrv/linux/SUPDrv-linux.c 2015-03-17 12:19:33.000000000 +0100
4@@ -48,12 +48,6 @@
5 # include <iprt/power.h>
6 # define VBOX_WITH_SUSPEND_NOTIFICATION
7 #endif
8-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
9-# include <asm/smap.h>
10-#else
11-static inline void clac(void) { }
12-static inline void stac(void) { }
13-#endif
14
15 #include <linux/sched.h>
16 #ifdef CONFIG_DEVFS_FS
17diff -u '--exclude=.svn' '--exclude=CVS' '--exclude=.*.d' '--exclude=.depend' '--exclude=.hdepend' '--exclude=.*.flags' -r a/vboxdrv/r0drv/linux/the-linux-kernel.h b/vboxdrv/r0drv/linux/the-linux-kernel.h
18--- a/vboxdrv/r0drv/linux/the-linux-kernel.h 2015-03-17 12:19:20.000000000 +0100
19+++ b/vboxdrv/r0drv/linux/the-linux-kernel.h 2015-03-17 12:19:33.000000000 +0100
20@@ -145,6 +145,13 @@
21 # include <asm/tlbflush.h>
22 #endif
23
24+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
25+# include <asm/smap.h>
26+#else
27+static inline void clac(void) { }
28+static inline void stac(void) { }
29+#endif
30+
31 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
32 # ifndef page_to_pfn
33 # define page_to_pfn(page) ((page) - mem_map)
34diff -u '--exclude=.svn' '--exclude=CVS' '--exclude=.*.d' '--exclude=.depend' '--exclude=.hdepend' '--exclude=.*.flags' -r a/vboxdrv/r0drv/linux/threadctxhooks-r0drv-linux.c b/vboxdrv/r0drv/linux/threadctxhooks-r0drv-linux.c
35--- a/vboxdrv/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-17 12:19:20.000000000 +0100
36+++ b/vboxdrv/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-17 12:19:33.000000000 +0100
37@@ -89,7 +89,9 @@
38 Assert(pThis->fRegistered);
39 Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
40
41+ stac();
42 pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_PREEMPTING, pThis->pvUser);
43+ clac();
44 }
45
46
47@@ -109,7 +111,9 @@
48 AssertPtr(pThis->pfnThreadCtxHook);
49 Assert(pThis->fRegistered);
50
51+ stac();
52 pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_RESUMED, pThis->pvUser);
53+ clac();
54 }
55
56

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy