commit 6aad01650b031eaec88878dc85c215e97582ef3e
Author: Jan Rękorajski <[email protected]>
Date: Mon Apr 25 09:06:34 2016 +0200
- fix missing CLOCKSOURCE_MASK definition
clocksource.patch | 26 ++++++++++++++++++++++++++
igb.spec | 2 ++
2 files changed, 28 insertions(+)
---
diff --git a/igb.spec b/igb.spec
index 53b211d..d44dfc5 100644
--- a/igb.spec
+++ b/igb.spec
@@ -17,6 +17,7 @@ License: GPL v2
Group: Base/Kernel
Source0:
http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
# Source0-md5: 6c0d7dfdb161128da7c039fc83bbdba0
+Patch0: clocksource.patch
URL: http://sourceforge.net/projects/e1000/
%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >=
3:2.6.20.2}
BuildRequires: rpm-build-macros >= 1.701
@@ -80,6 +81,7 @@ EOF\
%prep
%setup -q -n %{pname}-%{version}
+%patch0 -p1
cat > src/Makefile <<'EOF'
obj-m := igb.o
diff --git a/clocksource.patch b/clocksource.patch
new file mode 100644
index 0000000..6434ac6
--- /dev/null
+++ b/clocksource.patch
@@ -0,0 +1,26 @@
+--- igb-5.3.4.4/src/igb.h~ 2016-02-26 01:48:39.000000000 +0100
++++ igb-5.3.4.4/src/igb.h 2016-04-25 09:05:40.372457551 +0200
+@@ -72,9 +72,8 @@
+ #ifdef HAVE_PTP_1588_CLOCK
+ #ifdef HAVE_INCLUDE_LINUX_TIMECOUNTER_H
+ #include <linux/timecounter.h>
+-#else
+-#include <linux/clocksource.h>
+ #endif /* HAVE_INCLUDE_TIMECOUNTER_H */
++#include <linux/clocksource.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/ptp_clock_kernel.h>
+ #endif /* HAVE_PTP_1588_CLOCK */
+--- igb-5.3.4.4/src/kcompat.h~ 2016-02-26 01:48:39.000000000 +0100
++++ igb-5.3.4.4/src/kcompat.h 2016-04-25 09:05:53.839075764 +0200
+@@ -4720,9 +4720,8 @@
+ #ifndef NO_PTP_SUPPORT
+ #ifdef HAVE_INCLUDE_LINUX_TIMECOUNTER_H
+ #include <linux/timecounter.h>
+-#else
+-#include <linux/clocksource.h>
+ #endif
++#include <linux/clocksource.h>
+ static inline void __kc_timecounter_adjtime(struct timecounter *tc, s64 delta)
+ {
+ tc->nsec += delta;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/6aad01650b031eaec88878dc85c215e97582ef3e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
