[arch-commits] Commit in ndiswrapper-arch/repos/community-testing-x86_64 (6 files)
Date: Tuesday, December 24, 2019 @ 05:37:27
Author: heftig
Revision: 539712
archrelease: copy trunk to community-testing-x86_64
Added:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
(from rev 539709, ndiswrapper-arch/trunk/PKGBUILD)
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.3.patch
(from rev 539709, ndiswrapper-arch/trunk/kernel-5.3.patch)
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.4.patch
(from rev 539709, ndiswrapper-arch/trunk/kernel-5.4.patch)
Deleted:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.3.patch
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.4.patch
--+
PKGBUILD | 80 +++---
kernel-5.3.patch | 138 ++---
kernel-5.4.patch | 44
3 files changed, 131 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2019-12-24 05:37:26 UTC (rev 539711)
+++ PKGBUILD2019-12-24 05:37:27 UTC (rev 539712)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan
-# Contributor: maz-1
-
-pkgname=ndiswrapper-arch
-pkgver=1.62
-pkgrel=14
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors, kernel module for Arch kernel"
-arch=('x86_64')
-url="https://sourceforge.net/projects/ndiswrapper/;
-license=('GPL')
-makedepends=('linux-headers')
-provides=('NDISWRAPPER-MODULE')
-replaces=('ndiswrapper-module')
-source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz;
-'kernel-5.3.patch' 'kernel-5.4.patch')
-sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
-
'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d'
-
'36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429')
-
-prepare() {
- cd ndiswrapper-$pkgver
- patch --no-backup-if-mismatch -p2 -i "$srcdir"/kernel-5.3.patch
- patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.4.patch
-}
-
-build() {
- _kernver="$(
+# Contributor: maz-1
+
+pkgname=ndiswrapper-arch
+pkgver=1.62
+pkgrel=15
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors, kernel module for Arch kernel"
+arch=('x86_64')
+url="https://sourceforge.net/projects/ndiswrapper/;
+license=('GPL')
+makedepends=('linux-headers')
+provides=('NDISWRAPPER-MODULE')
+replaces=('ndiswrapper-module')
+source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz;
+'kernel-5.3.patch' 'kernel-5.4.patch')
+sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
+
'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d'
+
'36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch --no-backup-if-mismatch -p2 -i "$srcdir"/kernel-5.3.patch
+ patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.4.patch
+}
+
+build() {
+ _kernver="$(task = NULL;
- info->count = 0;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_setall(>cpus_allowed);
-+#else
-+ cpumask_setall(>cpus_mask);
-+#endif
- #endif
- }
- } while (0);
-diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
-index 3c4c6ff..8a71ae3 100644
a/ndiswrapper/driver/ntoskernel.h
-+++ b/ndiswrapper/driver/ntoskernel.h
-@@ -107,7 +107,11 @@ static cpumask_t cpumasks[NR_CPUS];
- #endif /* CONFIG_SMP */
-
- #ifndef tsk_cpus_allowed
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-+#else
-+#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_mask)
-+#endif
- #endif
-
- #ifndef __packed
-@@ -631,7 +635,12 @@ struct irql_info {
- int count;
- struct mutex lock;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_t cpus_allowed;
-+#else
-+ const cpumask_t *cpus_ptr;
-+ cpumask_t cpus_mask;
-+#endif
- #endif
- struct task_struct *task;
- };
-@@ -658,7 +667,11 @@ static inline KIRQL raise_irql(KIRQL newirql)
- /* TODO: is this enough to pin down to current cpu? */
- #ifdef CONFIG_SMP
- assert(task_cpu(current) == smp_processor_id());
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_copy(>cpus_allowed, tsk_cpus_allowed(current));
-+#else
-+
[arch-commits] Commit in ndiswrapper-arch/repos/community-testing-x86_64 (6 files)
Date: Friday, November 29, 2019 @ 15:59:29
Author: heftig
Revision: 534376
archrelease: copy trunk to community-testing-x86_64
Added:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
(from rev 534370, ndiswrapper-arch/trunk/PKGBUILD)
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.3.patch
(from rev 534370, ndiswrapper-arch/trunk/kernel-5.3.patch)
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.4.patch
(from rev 534371, ndiswrapper-arch/trunk/kernel-5.4.patch)
Deleted:
ndiswrapper-arch/repos/community-testing-x86_64/PKGBUILD
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.3.patch
ndiswrapper-arch/repos/community-testing-x86_64/kernel-5.4.patch
--+
PKGBUILD | 80 +++---
kernel-5.3.patch | 138 ++---
kernel-5.4.patch | 44
3 files changed, 131 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2019-11-29 15:59:29 UTC (rev 534375)
+++ PKGBUILD2019-11-29 15:59:29 UTC (rev 534376)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan
-# Contributor: maz-1
-
-pkgname=ndiswrapper-arch
-pkgver=1.62
-pkgrel=7
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors, kernel module for Arch kernel"
-arch=('x86_64')
-url="https://sourceforge.net/projects/ndiswrapper/;
-license=('GPL')
-makedepends=('linux-headers')
-provides=('NDISWRAPPER-MODULE')
-replaces=('ndiswrapper-module')
-source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz;
-'kernel-5.3.patch' 'kernel-5.4.patch')
-sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
-
'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d'
-
'36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429')
-
-prepare() {
- cd ndiswrapper-$pkgver
- patch --no-backup-if-mismatch -p2 -i "$srcdir"/kernel-5.3.patch
- patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.4.patch
-}
-
-build() {
- _kernver="$(
+# Contributor: maz-1
+
+pkgname=ndiswrapper-arch
+pkgver=1.62
+pkgrel=8
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors, kernel module for Arch kernel"
+arch=('x86_64')
+url="https://sourceforge.net/projects/ndiswrapper/;
+license=('GPL')
+makedepends=('linux-headers')
+provides=('NDISWRAPPER-MODULE')
+replaces=('ndiswrapper-module')
+source=("https://sourceforge.net/projects/ndiswrapper/files/stable/ndiswrapper-$pkgver.tar.gz;
+'kernel-5.3.patch' 'kernel-5.4.patch')
+sha512sums=('a6e111bc699572642e44d6d31cc2f06374648a01b8dd7dd4e74d6ad5e187e39f99faee38f792c83a94d4618ae4d8866914fb3f60b1d80e838a753285ea7cf783'
+
'c404f35280534b172235c5c578657d7a30ac2253c7c2abedd65a183d09390e95e7c3030cb409accb4d198ff0411482f8029f8664418c99d5672f92e9c733801d'
+
'36450042db79ed4545030276bff9db1bc9895259f38c1c0bf4dc238ad76ec61c2e08d437997dafd327f2a8fd1694d61e418941555e92144e3ec86c8066561429')
+
+prepare() {
+ cd ndiswrapper-$pkgver
+ patch --no-backup-if-mismatch -p2 -i "$srcdir"/kernel-5.3.patch
+ patch --no-backup-if-mismatch -p1 -i "$srcdir"/kernel-5.4.patch
+}
+
+build() {
+ _kernver="$(task = NULL;
- info->count = 0;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_setall(>cpus_allowed);
-+#else
-+ cpumask_setall(>cpus_mask);
-+#endif
- #endif
- }
- } while (0);
-diff --git a/ndiswrapper/driver/ntoskernel.h b/ndiswrapper/driver/ntoskernel.h
-index 3c4c6ff..8a71ae3 100644
a/ndiswrapper/driver/ntoskernel.h
-+++ b/ndiswrapper/driver/ntoskernel.h
-@@ -107,7 +107,11 @@ static cpumask_t cpumasks[NR_CPUS];
- #endif /* CONFIG_SMP */
-
- #ifndef tsk_cpus_allowed
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-+#else
-+#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_mask)
-+#endif
- #endif
-
- #ifndef __packed
-@@ -631,7 +635,12 @@ struct irql_info {
- int count;
- struct mutex lock;
- #ifdef CONFIG_SMP
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_t cpus_allowed;
-+#else
-+ const cpumask_t *cpus_ptr;
-+ cpumask_t cpus_mask;
-+#endif
- #endif
- struct task_struct *task;
- };
-@@ -658,7 +667,11 @@ static inline KIRQL raise_irql(KIRQL newirql)
- /* TODO: is this enough to pin down to current cpu? */
- #ifdef CONFIG_SMP
- assert(task_cpu(current) == smp_processor_id());
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
- cpumask_copy(>cpus_allowed, tsk_cpus_allowed(current));
-+#else
-+
