| 1 |
commit: 340f01e5f32274c5f8974694f637f5718b2c148b |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 2 16:40:30 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 5 15:04:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340f01e5 |
| 7 |
|
| 8 |
app-emulation/virtualbox-guest-additions: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/14532 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
...additions-6.0.12-linux-5.3+-compatibility.patch | 75 ---------------------- |
| 15 |
1 file changed, 75 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index ad4b460c814..00000000000 |
| 20 |
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,75 +0,0 @@ |
| 23 |
-https://bugs.gentoo.org/694614 |
| 24 |
-https://www.virtualbox.org/ticket/18911#comment:5 |
| 25 |
- |
| 26 |
---- a/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c |
| 27 |
-+++ b/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c |
| 28 |
-@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign |
| 29 |
- #endif |
| 30 |
- if (in_dev != NULL) |
| 31 |
- { |
| 32 |
-- for_ifa(in_dev) { |
| 33 |
-+ struct in_ifaddr *ifa; |
| 34 |
-+ |
| 35 |
-+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { |
| 36 |
- if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) |
| 37 |
- return NOTIFY_OK; |
| 38 |
- |
| 39 |
-@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign |
| 40 |
- |
| 41 |
- pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, |
| 42 |
- /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); |
| 43 |
-- } endfor_ifa(in_dev); |
| 44 |
-+ } |
| 45 |
- } |
| 46 |
- |
| 47 |
- /* |
| 48 |
---- a/Runtime/r0drv/linux/mp-r0drv-linux.c |
| 49 |
-+++ b/Runtime/r0drv/linux/mp-r0drv-linux.c |
| 50 |
-@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) |
| 51 |
- if (RTCpuSetCount(&OnlineSet) > 1) |
| 52 |
- { |
| 53 |
- /* Fire the function on all other CPUs without waiting for completion. */ |
| 54 |
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
| 55 |
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) |
| 56 |
-+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); |
| 57 |
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
| 58 |
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); |
| 59 |
-+ Assert(!rc); NOREF(rc); |
| 60 |
- # else |
| 61 |
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); |
| 62 |
--# endif |
| 63 |
- Assert(!rc); NOREF(rc); |
| 64 |
-+# endif |
| 65 |
- } |
| 66 |
- #endif |
| 67 |
- |
| 68 |
-@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) |
| 69 |
- { |
| 70 |
- #ifdef CONFIG_SMP |
| 71 |
- IPRT_LINUX_SAVE_EFL_AC(); |
| 72 |
-- int rc; |
| 73 |
- RTMPARGS Args; |
| 74 |
- |
| 75 |
- RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; |
| 76 |
-@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) |
| 77 |
- Args.cHits = 0; |
| 78 |
- |
| 79 |
- RTThreadPreemptDisable(&PreemptState); |
| 80 |
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
| 81 |
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); |
| 82 |
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) |
| 83 |
-+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); |
| 84 |
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) |
| 85 |
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); |
| 86 |
-+ Assert(rc == 0); NOREF(rc); |
| 87 |
- # else /* older kernels */ |
| 88 |
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); |
| 89 |
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); |
| 90 |
-+ Assert(rc == 0); NOREF(rc); |
| 91 |
- # endif /* older kernels */ |
| 92 |
- RTThreadPreemptRestore(&PreemptState); |
| 93 |
- |
| 94 |
-- Assert(rc == 0); NOREF(rc); |
| 95 |
- IPRT_LINUX_RESTORE_EFL_AC(); |
| 96 |
- #else |
| 97 |
- RT_NOREF(pfnWorker, pvUser1, pvUser2); |
Archives