From 8598e91babb1ef44be91e0bee3b5a00554919813c00efb030f166020a9069ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 19 May 2015 15:33:08 +0000 Subject: [PATCH] Accepting request 308029 from home:pluskalm:branches:Virtualization - Add smap.diff (boo#931461) OBS-URL: https://build.opensuse.org/request/show/308029 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=193 --- smap.diff | 17 +++++++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 smap.diff diff --git a/smap.diff b/smap.diff new file mode 100644 index 0000000..fc98a14 --- /dev/null +++ b/smap.diff @@ -0,0 +1,17 @@ +Index: VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +=================================================================== +--- VirtualBox-4.3.28.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ VirtualBox-4.3.28/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +@@ -48,6 +48,12 @@ + # include + # define VBOX_WITH_SUSPEND_NOTIFICATION + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) ++# include ++#else ++static inline void clac(void) { } ++static inline void stac(void) { } ++#endif + + #include + #ifdef CONFIG_DEVFS_FS diff --git a/virtualbox.changes b/virtualbox.changes index deaa2e2..2ed2d6a 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 19 15:09:12 UTC 2015 - mpluskal@suse.com + +- Add smap.diff (boo#931461) + ------------------------------------------------------------------- Fri May 15 07:49:31 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index fb0e2e5..a831b06 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -73,6 +73,8 @@ Patch101: vbox-default-os-type.diff Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) Patch104: vbox-fpie.diff +#smap issues on Haswell or Broadwell (boo#931461) +Patch105: smap.diff BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel BuildRequires: acpica @@ -293,6 +295,7 @@ This package contains icons for guest desktop files that were created on the des %patch101 -p1 %patch103 %patch104 -p1 +%patch105 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config