7:31 p.m.
commit d09be992b70357721cbb92698fc6ee4542128a57
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Fri Apr 19 19:29:01 2024 +0200
Fix patches Hunk offset
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
0018-backport-nv_install_notifier-changes-from-418.30.patch | 12 ++++++------
bashisms.patch | 2 +-
cc_version_check-gcc5.patch | 2 +-
conftest-verbose.patch | 6 +++---
kernel-4.16+-memory-encryption.patch | 2 +-
...rnel-6.5-garbage-collect-all-references-to-get_user.patch | 2 +-
...rnel-6.5-handle-get_user_pages-vmas-argument-remova.patch | 4 ++--
...ackport-drm_gem_prime_handle_to_fd-changes-from-470.patch | 2 +-
use-kbuild-compiler.patch | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/0018-backport-nv_install_notifier-changes-from-418.30.patch
b/0018-backport-nv_install_notifier-changes-from-418.30.patch
index 7d311c5..60597e3 100644
--- a/0018-backport-nv_install_notifier-changes-from-418.30.patch
+++ b/0018-backport-nv_install_notifier-changes-from-418.30.patch
@@ -11,7 +11,7 @@ diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c
index 6cfd400..d311e85 100644
--- a/nvidia/nv-acpi.c
+++ b/nvidia/nv-acpi.c
-@@ -503,19 +503,19 @@ static int nv_acpi_match(struct acpi_device *device, struct
acpi_driver *driver)
+@@ -502,19 +502,19 @@ static int nv_acpi_match(struct acpi_device *device, struct
acpi_driver *driver)
#endif
/* Do the necessary allocations and install notifier "handler" on the
device-node "device" */
@@ -35,7 +35,7 @@ index 6cfd400..d311e85 100644
}
rmStatus = os_alloc_mem((void **) &pNvAcpiObject, sizeof(nv_acpi_t));
-@@ -533,32 +533,25 @@ static NV_STATUS nv_install_notifier(struct acpi_handle *handle,
acpi_notify_han
+@@ -532,32 +532,25 @@ static NV_STATUS nv_install_notifier(struct acpi_handle *handle,
acpi_notify_han
if (!ACPI_FAILURE(status))
{
pNvAcpiObject->notify_handler_installed = 1;
@@ -72,7 +72,7 @@ index 6cfd400..d311e85 100644
if (ACPI_FAILURE(status))
{
nv_printf(NV_DBG_INFO,
-@@ -568,14 +561,12 @@ static void nv_uninstall_notifier(struct acpi_device *device,
acpi_notify_handle
+@@ -567,14 +560,12 @@ static void nv_uninstall_notifier(struct acpi_device *device,
acpi_notify_handle
{
nv_kmem_cache_free_stack(pNvAcpiObject->sp);
os_free_mem((void *)pNvAcpiObject);
@@ -88,7 +88,7 @@ index 6cfd400..d311e85 100644
/*
* acpi methods init function.
* check if the NVIF, _DSM and WMMX methods are present in the acpi namespace.
-@@ -586,7 +577,6 @@ void NV_API_CALL nv_acpi_methods_init(NvU32 *handlesPresent)
+@@ -585,7 +576,6 @@ void NV_API_CALL nv_acpi_methods_init(NvU32 *handlesPresent)
{
#if defined(NV_ACPI_BUS_GET_DEVICE_PRESENT)
struct acpi_device *device = NULL;
@@ -96,7 +96,7 @@ index 6cfd400..d311e85 100644
int retVal = -1;
#endif
-@@ -619,8 +609,10 @@ void NV_API_CALL nv_acpi_methods_init(NvU32 *handlesPresent)
+@@ -618,8 +608,10 @@ void NV_API_CALL nv_acpi_methods_init(NvU32 *handlesPresent)
nodes' structures. So nothing more to be done */
}
@@ -109,7 +109,7 @@ index 6cfd400..d311e85 100644
nvif_parent_gpu_handle = NULL;
} while (0);
-@@ -685,9 +677,10 @@ void NV_API_CALL nv_acpi_methods_uninit(void)
+@@ -684,9 +676,10 @@ void NV_API_CALL nv_acpi_methods_uninit(void)
#if defined(NV_ACPI_BUS_GET_DEVICE_PRESENT)
acpi_bus_get_device(nvif_parent_gpu_handle, &device);
diff --git a/bashisms.patch b/bashisms.patch
index be38881..92c2749 100644
--- a/bashisms.patch
+++ b/bashisms.patch
@@ -3,7 +3,7 @@ Description: fix bashisms in conftest.sh
--- a/conftest.sh
+++ b/conftest.sh
-@@ -4858,7 +4858,7 @@
+@@ -4902,7 +4902,7 @@
if [ -n "$VGX_BUILD" ]; then
if [ -f /proc/xen/capabilities ]; then
diff --git a/cc_version_check-gcc5.patch b/cc_version_check-gcc5.patch
index dba5435..31f7efa 100644
--- a/cc_version_check-gcc5.patch
+++ b/cc_version_check-gcc5.patch
@@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards
--- a/conftest.sh
+++ b/conftest.sh
-@@ -4616,7 +4616,7 @@
+@@ -4660,7 +4660,7 @@
kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2`
echo "
diff --git a/conftest-verbose.patch b/conftest-verbose.patch
index 10cc577..fa5ad84 100644
--- a/conftest-verbose.patch
+++ b/conftest-verbose.patch
@@ -3,7 +3,7 @@ Description: dump the generated conftest headers
--- a/Kbuild
+++ b/Kbuild
-@@ -115,6 +115,16 @@
+@@ -114,6 +114,16 @@
NV_CONFTEST_HEADERS += $(NV_CONFTEST_COMPILE_TEST_HEADERS)
@@ -20,7 +20,7 @@ Description: dump the generated conftest headers
#
# Generate a header file for a single conftest compile test. Each compile test
# header depends on conftest.sh, as well as the generated conftest/headers.h
-@@ -139,6 +149,8 @@
+@@ -138,6 +148,8 @@
@mkdir -p $(obj)/conftest
@# concatenate /dev/null to prevent cat from hanging when $$^ is empty
@cat $$^ /dev/null > $$@
@@ -29,7 +29,7 @@ Description: dump the generated conftest headers
endef
#
-@@ -158,13 +170,17 @@
+@@ -157,13 +169,17 @@
$(eval $(call
NV_GENERATE_COMPILE_TEST_HEADER,symbols,$(NV_CONFTEST_SYMBOL_COMPILE_TESTS)))
$(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPE_COMPILE_TESTS)))
diff --git a/kernel-4.16+-memory-encryption.patch b/kernel-4.16+-memory-encryption.patch
index 737295c..e19e7fb 100644
--- a/kernel-4.16+-memory-encryption.patch
+++ b/kernel-4.16+-memory-encryption.patch
@@ -18,7 +18,7 @@ diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index b23dbb4..42dc576 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
-@@ -2056,7 +2056,12 @@ compile_test() {
+@@ -2074,7 +2074,12 @@ compile_test() {
# Determine if the phys_to_dma function is present.
#
CODE="
diff --git
a/nvidia-390xx-kmod-0027-kernel-6.5-garbage-collect-all-references-to-get_user.patch
b/nvidia-390xx-kmod-0027-kernel-6.5-garbage-collect-all-references-to-get_user.patch
index 183e5b4..4398143 100644
--- a/nvidia-390xx-kmod-0027-kernel-6.5-garbage-collect-all-references-to-get_user.patch
+++ b/nvidia-390xx-kmod-0027-kernel-6.5-garbage-collect-all-references-to-get_user.patch
@@ -129,7 +129,7 @@ diff --git a/conftest.sh b/conftest.sh
index 24daa850..abe435ff 100755
--- a/conftest.sh
+++ b/conftest.sh
-@@ -3081,136 +3081,6 @@ compile_test() {
+@@ -3086,136 +3086,6 @@ compile_test() {
return
;;
diff --git
a/nvidia-390xx-kmod-0028-kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
b/nvidia-390xx-kmod-0028-kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
index 2aa2d3f..bea0cc3 100644
--- a/nvidia-390xx-kmod-0028-kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
+++ b/nvidia-390xx-kmod-0028-kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
@@ -95,7 +95,7 @@ diff --git a/conftest.sh b/conftest.sh
index abe435ff..0131fab5 100755
--- a/conftest.sh
+++ b/conftest.sh
-@@ -3051,7 +3051,6 @@ compile_test() {
+@@ -3056,7 +3056,6 @@ compile_test() {
# write and force parameters AND that gup has task_struct and
# mm_struct as its first arguments.
# Return if available.
@@ -103,7 +103,7 @@ index abe435ff..0131fab5 100755
echo "$CONFTEST_PREAMBLE
#include <linux/mm.h>
-@@ -3075,6 +3074,31 @@ compile_test() {
+@@ -3080,6 +3079,31 @@ compile_test() {
return
fi
diff --git
a/nvidia-390xx-kmod-0029-kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
b/nvidia-390xx-kmod-0029-kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
index 8fa15d5..a1b905e 100644
---
a/nvidia-390xx-kmod-0029-kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
+++
b/nvidia-390xx-kmod-0029-kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
@@ -12,7 +12,7 @@ diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
index 7e6f5e8..c0cc77a 100644
--- a/nvidia-drm/nvidia-drm-drv.c
+++ b/nvidia-drm/nvidia-drm-drv.c
-@@ -697,7 +697,19 @@ static struct drm_driver nv_drm_driver = {
+@@ -705,7 +705,19 @@ static struct drm_driver nv_drm_driver = {
.ioctls = nv_drm_ioctls,
.num_ioctls = ARRAY_SIZE(nv_drm_ioctls),
diff --git a/use-kbuild-compiler.patch b/use-kbuild-compiler.patch
index 6f13e7a..bc99b71 100644
--- a/use-kbuild-compiler.patch
+++ b/use-kbuild-compiler.patch
@@ -7,7 +7,7 @@ Description: let Kbuild set the compiler version
--- a/Makefile
+++ b/Makefile
-@@ -78,8 +78,8 @@ else
+@@ -82,8 +82,8 @@ else
.PHONY: modules module clean clean_conftest modules_install
modules clean modules_install: