[nvidia-390xx-kmod] Prepare for kernel 5.7

commit 6ab9d79e0102c580faa65fe76c8db8eec294a669 Author: Henrik Nordström <henrik(a)hno.se&gt; Date: Sat May 9 23:18:32 2020 +0200 Prepare for kernel 5.7 kernel-5.7-rc1-390.132.patch | 22 ++++++++++++++++++++++ nvidia-390xx-kmod.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) --- diff --git a/kernel-5.7-rc1-390.132.patch b/kernel-5.7-rc1-390.132.patch new file mode 100644 index 0000000..66d0c94 --- /dev/null +++ b/kernel-5.7-rc1-390.132.patch @@ -0,0 +1,22 @@ +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index 463a464..353697a 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -139,6 +139,7 @@ test_headers() { + # Arch specific headers which need testing + FILES_ARCH="asm/book3s/64/hash-64k.h" + FILES_ARCH="$FILES_ARCH asm/set_memory.h" ++ FILES_ARCH="$FILES_ARCH asm/pgtable.h" + FILES_ARCH="$FILES_ARCH asm/powernv.h" + FILES_ARCH="$FILES_ARCH asm/tlbflush.h" + +@@ -422,6 +423,9 @@ compile_test() { + # Determine if the set_memory_array_uc() function is present. + # + CODE=" ++ #if defined(NV_ASM_PGTABLE_H_PRESENT) ++ #include <asm/pgtable.h> ++ #endif + #if defined(NV_ASM_SET_MEMORY_H_PRESENT) + #include <asm/set_memory.h> + #else diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec index 6f34839..1ba3c57 100644 --- a/nvidia-390xx-kmod.spec +++ b/nvidia-390xx-kmod.spec @@ -12,7 +12,7 @@ Name: nvidia-390xx-kmod Epoch: 3 Version: 390.132 # Taken over by kmodtool -Release: 5%{?dist} +Release: 6%{?dist} Summary: NVIDIA 390xx display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -23,6 +23,7 @@ Patch0: nv-linux-arm.patch Patch1: nv-linux-arm2.patch Patch2: https://gitlab.com/EULA/snippets/-/raw/master/NVIDIA/kernel-5.5-390.132-n... Patch3: https://gitlab.com/EULA/snippets/-/raw/master/NVIDIA/kernel-5.6-390.132.p... +Patch4: https://gitlab.com/EULA/snippets/-/raw/master/NVIDIA/kernel-5.7-rc1-390.1... # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -79,6 +80,9 @@ done %changelog +* Sat May 09 2020 Henrik Nordstrom <henrik(a)henriknordstrom.net&gt; - 3:390.132-6 +- Patch for kernel 5.7 + * Sat May 09 2020 Henrik Nordstrom <henrik(a)henriknordstrom.net&gt; - 3:390.132-5 - Update kernel-5.6 patch