mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
bd7ce1581d
The patch for kernel version 3.18 is already applied upstream, so we don't need it any longer. Without i686-build-failure.patch, the build for i686-linux fails because it references rdtscl(), which is no longer available in Linux 4.3.0. Patch for missing rdtscl() is from Arch Linux: https://aur.archlinux.org/cgit/aur.git/tree/002-rdtscl.patch?h=broadcom-wl-ck I've tested building against 32 and 64 bit Linux versions 3.18.36, 4.4.16 and 4.7.0. The hashes were verified using the ones from the AUR (using the 16 bit hashes of course): $ nix-hash --type sha256 --to-base16 1kaqa2dw3nb8k23ffvx46g8jj3wdhz8xa6jp1v3wb35cjfr712sg 4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd $ nix-hash --type sha256 --to-base16 1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz 5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be AUR hashes can be found at: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=broadcom-wl&id=9d6f10b1b7745fbf5d140ac749e2253caf70daa8#n26 Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @phreedom, @vcunat
19 lines
620 B
Diff
19 lines
620 B
Diff
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit?id=fe47ae6e1a5005b2e82f7eab57b5c3820453293a
|
|
https://git.kernel.org/cgit/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
|