jengelh/virtualbox
SHA256
1
0
Fork 1
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 423472 from home:lwfinger:branches:Virtualization

Browse Source 
Fix missing ExclusiveArch directive

OBS-URL: https://build.opensuse.org/request/show/423472
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=268
This commit is contained in:
Ismail Dönmez 2016-08-31 07:26:51 +00:00 committed by Git OBS Bridge
parent d98b0f1e64
commit 4bac402b42
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modify_for_4_8_bo_move.patch
View File

@ -33,3 +33,24 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
{
struct vbox_private *vbox = dev->dev_private;
vbox->initial_mode_queried = false;
Index: VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@
#include <iprt/assert.h>
#include <iprt/err.h>
#include "r0drv/alloc-r0drv.h"
-
+#include <linux/kmemleak.h>
#if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP)
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)
@@ -294,6 +294,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb
fFlags &= ~RTMEMHDR_FLAG_KMALLOC;
pHdr = vmalloc(cb + sizeof(*pHdr));
}
+ kmemleak_not_leak(pHdr);
}
else
pHdr = vmalloc(cb + sizeof(*pHdr));

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Aug 28 01:59:37 UTC 2016 - Larry.Finger@lwfinger.net
- Add "ExclusiveArch: %ix86 x86_64" line back into the spec file.
Handle a false positive indication from kmemleak. This patch is added to "modify_for_4_8_bo_move.patch".
-------------------------------------------------------------------
Thu Aug 18 20:24:23 UTC 2016 - Larry.Finger@lwfinger.net

1
virtualbox.spec
View File

@ -158,6 +158,7 @@ Provides: %{name}-ose = %{version}
Obsoletes: %{name}-ose < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template)
ExclusiveArch: %ix86 x86_64
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit
BuildRequires: gcc-c++-32bit