mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 19:23:50 +00:00
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
|