Add patch for kernels >= 5.5

3 files changed, 30 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b557ed189db..a1c2d5d85587 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = netatop-dkms
 	pkgdesc = Atop network kernel module, enables network statistics in atop
 	pkgver = 2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.atoptool.nl/
 	arch = x86_64
 	arch = i686
@@ -13,8 +13,10 @@ pkgbase = netatop-dkms
 	conflicts = netatop
 	source = http://atoptool.nl/download/netatop-2.0.tar.gz
 	source = netatop-dkms.conf
+	source = netatop_kernel_5.5.patch
 	sha256sums = c66d7ca094d667428924f2faff2afb816b17565e8c3628e43bfa0e1a2e22c20e
 	sha256sums = 56e9094e396fcdabadde4db8a9f21945484e4db93359dc22f2fb76436b1b2ea9
+	sha256sums = fe6f3f404117fa16d5ecc4bb912381a06082f5d7c8bb504e6506f024fa24649e
 
 pkgname = netatop-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 45c0bab00143..58b232a9acad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=netatop-dkms
 _pkgname=netatop
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Atop network kernel module, enables network statistics in atop"
 url="http://www.atoptool.nl/"
 groups=('modules')
@@ -12,11 +12,17 @@ depends=('atop' 'dkms')
 conflicts=('netatop')
 makedepends=('linux-headers')
 source=("http://atoptool.nl/download/netatop-${pkgver}.tar.gz"
-        "netatop-dkms.conf")
+        "netatop-dkms.conf"
+        "netatop_kernel_5.5.patch")
 sha256sums=('c66d7ca094d667428924f2faff2afb816b17565e8c3628e43bfa0e1a2e22c20e'
-            '56e9094e396fcdabadde4db8a9f21945484e4db93359dc22f2fb76436b1b2ea9')
+            '56e9094e396fcdabadde4db8a9f21945484e4db93359dc22f2fb76436b1b2ea9'
+            'fe6f3f404117fa16d5ecc4bb912381a06082f5d7c8bb504e6506f024fa24649e')
 arch=('x86_64' 'i686')
 
+prepare() {
+	patch -d "${srcdir}/${_pkgname}-${pkgver}" -Np1 -i "${srcdir}"/netatop_kernel_5.5.patch
+}
+
 build() {
 	cd $srcdir/$_pkgname-$pkgver
 	# build daemon, make sure that module can be built
diff --git a/netatop_kernel_5.5.patch b/netatop_kernel_5.5.patch
new file mode 100644
index 000000000000..7eb6f023663f
--- /dev/null
+++ b/netatop_kernel_5.5.patch
@@ -0,0 +1,18 @@
+diff -ur netatop-2.0/module/netatop.c netatop-2.0.new/module/netatop.c
+--- netatop-2.0/module/netatop.c	2017-09-30 12:06:32.000000000 +0200
++++ netatop-2.0.new/module/netatop.c	2020-02-28 15:04:43.902624927 +0100
+@@ -965,7 +965,12 @@
+ 	tip->id    	= id;
+ 	tip->type    	= type;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
++	// real_start_time was renamed to start_boottime (https://github.com/torvalds/linux/commit/cf25e24db6)
++	tip->btime	= div_u64((current->start_boottime +
++				(boottime.tv_sec * NSEC_PER_SEC +
++					boottime.tv_sec)), NSEC_PER_SEC);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)
+ 	tip->btime	= div_u64((current->real_start_time +
+ 				(boottime.tv_sec * NSEC_PER_SEC +
+ 					boottime.tv_sec)), NSEC_PER_SEC);
+Tylko w netatop-2.0.new/module: .netatop.o.d