diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-09-13 19:19:49 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-09-13 19:19:49 +0000 |
| commit | 88d95ab6f936d2397ebfadeab789ea30928c4ada (patch) | |
| tree | 253eb667f11ee505c8ba8c04ba2ceaf8e7459750 /emulators/virtualbox-ose/files | |
| parent | 721b15c6369efb844315b87118c2d45d187f52bc (diff) | |
| download | ports-88d95ab6f936d2397ebfadeab789ea30928c4ada.tar.gz ports-88d95ab6f936d2397ebfadeab789ea30928c4ada.zip | |
Notes
Diffstat (limited to 'emulators/virtualbox-ose/files')
3 files changed, 11 insertions, 82 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); |