linuxPackages.broadcom_sta: remove i686-build-failure.patch since it was applied upstream
This commit is contained in:
parent
2bfe2058a3
commit
9080e9067e
@ -24,7 +24,6 @@ stdenv.mkDerivation {
|
|||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./i686-build-failure.patch
|
|
||||||
./license.patch
|
./license.patch
|
||||||
./linux-4.7.patch
|
./linux-4.7.patch
|
||||||
# source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms
|
# source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
|
|
||||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=4ea1636b04dbd66536fa387bae2eea463efc705b
|
|
||||||
|
|
||||||
diff -ru a/src/shared/linux_osl.c b/src/shared/linux_osl.c
|
|
||||||
--- a/src/shared/linux_osl.c 2015-09-19 01:47:15.000000000 +0300
|
|
||||||
+++ b/src/shared/linux_osl.c 2015-11-21 15:20:30.585902518 +0200
|
|
||||||
@@ -932,7 +932,11 @@
|
|
||||||
uint cycles;
|
|
||||||
|
|
||||||
#if defined(__i386__)
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
|
|
||||||
+ cycles = (u32)rdtsc();
|
|
||||||
+#else
|
|
||||||
rdtscl(cycles);
|
|
||||||
+#endif
|
|
||||||
#else
|
|
||||||
cycles = 0;
|
|
||||||
#endif
|
|
Loading…
Reference in New Issue
Block a user