diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-09 23:14:31 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-09 23:14:31 +0000 |
| commit | a306c2530354c1c02351c4cc02eefa53c8d23eac (patch) | |
| tree | 85f473f0abb92a80a4a400a7c07eed79d83880bd /community/virtualbox/fix-kernel-panic.patch | |
| parent | 5135b52f901206bbb365152084e82e92c120e0be (diff) | |
Tue Aug 9 23:14:31 UTC 2011
Diffstat (limited to 'community/virtualbox/fix-kernel-panic.patch')
| -rw-r--r-- | community/virtualbox/fix-kernel-panic.patch | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch index 237715db2..1f1ea993d 100644 --- a/community/virtualbox/fix-kernel-panic.patch +++ b/community/virtualbox/fix-kernel-panic.patch @@ -1,22 +1,11 @@ -Index: src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
+Index: /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
===================================================================
---- src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73165)
-+++ src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 73166)
-@@ -32,6 +32,7 @@
- #include "internal/iprt.h"
-
- #include <iprt/mp.h>
-+#include <iprt/asm-amd64-x86.h>
- #include <iprt/err.h>
- #include <iprt/cpuset.h>
- #include <iprt/thread.h>
-@@ -82,7 +83,8 @@
- NOREF(pvUser1);
-
- AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-- AssertRelease(idCpu == RTMpCpuId()); /* ASSUMES iCpu == RTCPUID */
-+ AssertReleaseMsg(idCpu == RTMpCpuId(), /* ASSUMES iCpu == RTCPUID */
-+ ("idCpu=%u RTMpCpuId=%d ApicId=%d\n", idCpu, RTMpCpuId(), ASMGetApicId() ));
-
- switch (ulNativeEvent)
- {
\ No newline at end of file +--- /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38199)
++++ /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38232)
+@@ -78,5 +78,5 @@
+ * @remarks This can be invoked in interrupt context.
+ */
+-static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
++static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+ {
+ unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
|