Merge branch 'master' of gitpar:abslibre-mips64el

3 files changed, 16 insertions, 27 deletions

diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index a611a4b92..599232cfa 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53173 2011-07-31 12:12:47Z ibiru $
+# $Id: PKGBUILD 53837 2011-08-08 20:19:32Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
 pkgver=4.1.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -26,7 +26,7 @@ build() {
     patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
     patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
     patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
-    patch -Np0 -i "$srcdir/fix-kernel-panic.patch"
+    patch -Np2 -i "$srcdir/fix-kernel-panic.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -203,6 +203,6 @@ md5sums=('02556a6b4877cfdfbaa3ce0a0c0dcf31'
          'ed1341881437455d9735875ddf455fbe'
          '4cf75d9c091199a47a7a1bc2f4e347d9'
          '78ffa67ff131680f1d2b6f06d4325c5b'
-         'b3de603560b2fb2c33e704e4e8ab3de8'
+         '790a1456345fe74b6b714d71f90a1c6d'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '19b05b85a8a46af5a429b2ab618638cd')
+         '863107a852607b758b356cd53850679d')
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;

diff --git a/community/virtualbox/vboxdrv.sh b/community/virtualbox/vboxdrv.sh
index 845f6c769..aace25edf 100755
--- a/community/virtualbox/vboxdrv.sh
+++ b/community/virtualbox/vboxdrv.sh
@@ -21,7 +21,7 @@ fi
 case "$1" in
   setup)
     stat_busy "Unloading VirtualBox kernel modules"
-    for module in vbox{netflt,netadp,drv,pci}; do
+    for module in vbox{pci,netflt,netadp,drv}; do
       if grep -q "^${module}" /proc/modules; then
         MODLIST+=($module)
         modprobe -r $module