xf86-video-nvidia-legacy: fix 5.3-rc1

This commit is contained in:
MilhouseVH 2019-07-22 12:41:41 +01:00
parent 0f477689fc
commit 38fa231def

View File

@ -0,0 +1,56 @@
From ed289eab447108005a21ca8f85d90b8cb721712d Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 22 Jul 2019 12:40:01 +0100
Subject: [PATCH] on_each_cpu/smp_call_function: with 5.3-rc1 ignore return, as
always 0
See: https://github.com/torvalds/linux/commit/e0e86b111bca6bbf746c03ec5cf3e6a61fa3f8e9
---
kernel/nv-linux.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
index 4043bf1..10ba6a4 100644
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -873,14 +873,14 @@ extern void *nv_stack_t_cache;
#if (NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT == 4)
#define NV_SMP_CALL_FUNCTION(func, info, wait) \
({ \
- int __ret = smp_call_function(func, info, 1, wait); \
- __ret; \
+ smp_call_function(func, info, 1, wait); \
+ 0; \
})
#elif (NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT == 3)
#define NV_SMP_CALL_FUNCTION(func, info, wait) \
({ \
- int __ret = smp_call_function(func, info, wait); \
- __ret; \
+ smp_call_function(func, info, wait); \
+ 0; \
})
#else
#error "NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT value unrecognized!"
@@ -893,14 +893,14 @@ extern void *nv_stack_t_cache;
#if (NV_ON_EACH_CPU_ARGUMENT_COUNT == 4)
#define NV_ON_EACH_CPU(func, info, wait) \
({ \
- int __ret = on_each_cpu(func, info, 1, wait); \
- __ret; \
+ on_each_cpu(func, info, 1, wait); \
+ 0; \
})
#elif (NV_ON_EACH_CPU_ARGUMENT_COUNT == 3)
#define NV_ON_EACH_CPU(func, info, wait) \
({ \
- int __ret = on_each_cpu(func, info, wait); \
- __ret; \
+ on_each_cpu(func, info, wait); \
+ 0; \
})
#else
#error "NV_ON_EACH_CPU_ARGUMENT_COUNT value unrecognized!"
--
2.14.1