diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
| commit | a515bba5570eaaa264b1fb590f91b7b772b83d3f (patch) | |
| tree | 48e51447595bd944be56da6f464132d219f63c6d /debian/patches/fix-kernel-build.patch | |
| parent | Merging upstream version 7.0.16-dfsg. (diff) | |
| download | virtualbox-a515bba5570eaaa264b1fb590f91b7b772b83d3f.tar.xz virtualbox-a515bba5570eaaa264b1fb590f91b7b772b83d3f.zip | |
Adding debian version 7.0.16-dfsg-1.debian/7.0.16-dfsg-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/fix-kernel-build.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/debian/patches/fix-kernel-build.patch b/debian/patches/fix-kernel-build.patch deleted file mode 100644 index 5645d89a..00000000 --- a/debian/patches/fix-kernel-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -Origin: https://bugs.launchpad.net/ubuntu/+source/virtualbox/+bug/2053024 -Author: Xu Zhen (xuzhen666) -Forwarded: irc -diff --git a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp -index 7b25b5cec..5cc50bf15 100644 ---- a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp -+++ b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp -@@ -1476,6 +1476,8 @@ SUPR0DECL(int) SUPR0TracerDeregisterImpl(void *hMod, PSUPDRVSESSION pSession) - SUPR0_EXPORT_SYMBOL(SUPR0TracerDeregisterImpl); - - -+#include <asm/nospec-branch.h> -+#include <asm/linkage.h> - /* - * The probe function is a bit more fun since we need tail jump optimizating. - * -@@ -1495,11 +1497,13 @@ SUPR0TracerFireProbe: \n\ - # if defined(RT_ARCH_AMD64) - __asm__("\ - movq g_pfnSupdrvProbeFireKernel(%rip), %rax \n\ -+ " ANNOTATE_RETPOLINE_SAFE " \n\ - jmp *%rax \n\ - "); - # elif defined(RT_ARCH_X86) - __asm__("\ - movl g_pfnSupdrvProbeFireKernel, %eax \n\ -+ " ANNOTATE_RETPOLINE_SAFE " \n\ - jmp *%eax \n\ - "); - # else -@@ -1511,7 +1515,7 @@ __asm__("\ - .type supdrvTracerProbeFireStub,@function \n\ - .global supdrvTracerProbeFireStub \n\ - supdrvTracerProbeFireStub: \n\ -- ret \n\ -+ " ASM_RET " \n\ - .size supdrvTracerProbeFireStub, . - supdrvTracerProbeFireStub \n\ - \n\ - .previous \n\ |