From 551e42373567d0d34ff95a79f32772ac05ad1fc8 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Mon, 20 Apr 2020 18:09:01 +0200 Subject: [PATCH] bbswitch: fix build with kernel 5.6+ --- srcpkgs/bbswitch/patches/kernel-5.6.0.patch | 55 +++++++++++++++++++++ srcpkgs/bbswitch/template | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/bbswitch/patches/kernel-5.6.0.patch diff --git a/srcpkgs/bbswitch/patches/kernel-5.6.0.patch b/srcpkgs/bbswitch/patches/kernel-5.6.0.patch new file mode 100644 index 00000000000..e88f1cad634 --- /dev/null +++ b/srcpkgs/bbswitch/patches/kernel-5.6.0.patch @@ -0,0 +1,55 @@ +From 4dbde5385f9c77155cc1ca57ce83bf64f9af2c4a Mon Sep 17 00:00:00 2001 +From: Mateusz Mandera +Date: Tue, 31 Mar 2020 15:11:30 +0200 +Subject: [PATCH] Use proc_ops structure for kernel version >= 5.6.0 + +Since 5.6.0, proc_create requires a proc_ops* argument +instead of file_operations*. +Commit with the migrationin the kernel source can be found at +https://github.com/torvalds/linux/commit/d56c0d45f0e27f814e87a1676b6bdccccbc252e9 +--- + bbswitch.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git bbswitch.c bbswitch.c +index 228d722..bbe50d0 100644 +--- bbswitch.c ++++ bbswitch.c +@@ -35,6 +35,10 @@ + #include + #include + #include ++#include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) ++#include ++#endif + + #define BBSWITCH_VERSION "0.8" + +@@ -375,6 +379,15 @@ static int bbswitch_pm_handler(struct notifier_block *nbp, + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) ++static struct proc_ops bbswitch_fops = { ++ .proc_open = bbswitch_proc_open, ++ .proc_read = seq_read, ++ .proc_write = bbswitch_proc_write, ++ .proc_lseek = seq_lseek, ++ .proc_release= single_release ++}; ++#else + static struct file_operations bbswitch_fops = { + .open = bbswitch_proc_open, + .read = seq_read, +@@ -382,6 +395,7 @@ static struct file_operations bbswitch_fops = { + .llseek = seq_lseek, + .release= single_release + }; ++#endif + + static struct notifier_block nb = { + .notifier_call = &bbswitch_pm_handler +-- +2.26.1 + diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template index 41e627f7406..317ca67d260 100644 --- a/srcpkgs/bbswitch/template +++ b/srcpkgs/bbswitch/template @@ -1,7 +1,7 @@ # Template file for 'bbswitch' pkgname=bbswitch version=0.8 -revision=2 +revision=3 hostmakedepends="git" makedepends="dkms" depends="dkms"