From 5f486de3127a9dd41cccf1de4cfaa1687f7d7113 Mon Sep 17 00:00:00 2001
From: Rob Norris <robn@despairlabs.com>
Date: Sat, 24 Aug 2024 20:58:57 +1000
Subject: [PATCH] config: remove HAVE_SCHED_SIGNAL_HEADER

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479
---
 config/kernel-sched.m4            | 26 --------------------------
 include/os/linux/spl/sys/signal.h |  3 ---
 module/os/linux/spl/spl-condvar.c |  3 ---
 3 files changed, 32 deletions(-)

diff --git a/config/kernel-sched.m4 b/config/kernel-sched.m4
index 91c1e91fa..8ef4cc6ee 100644
--- a/config/kernel-sched.m4
+++ b/config/kernel-sched.m4
@@ -20,36 +20,10 @@ AC_DEFUN([ZFS_AC_KERNEL_SCHED_RT_HEADER], [
 	])
 ])
 
-dnl #
-dnl # 4.11 API change,
-dnl # Moved things from linux/sched.h to linux/sched/signal.h
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED_SIGNAL_HEADER], [
-	ZFS_LINUX_TEST_SRC([sched_signal_header], [
-		#include <linux/sched.h>
-		#include <linux/sched/signal.h>
-	],[
-		return 0;
-	])
-])
-
-AC_DEFUN([ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER], [
-	AC_MSG_CHECKING([whether header linux/sched/signal.h exists])
-	ZFS_LINUX_TEST_RESULT([sched_signal_header], [
-		AC_DEFINE(HAVE_SCHED_SIGNAL_HEADER, 1,
-		    [linux/sched/signal.h exists])
-		AC_MSG_RESULT(yes)
-	],[
-		AC_MSG_RESULT(no)
-	])
-])
-
 AC_DEFUN([ZFS_AC_KERNEL_SRC_SCHED], [
 	ZFS_AC_KERNEL_SRC_SCHED_RT_HEADER
-	ZFS_AC_KERNEL_SRC_SCHED_SIGNAL_HEADER
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL_SCHED], [
 	ZFS_AC_KERNEL_SCHED_RT_HEADER
-	ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER
 ])
diff --git a/include/os/linux/spl/sys/signal.h b/include/os/linux/spl/sys/signal.h
index cb4b33261..473a1be14 100644
--- a/include/os/linux/spl/sys/signal.h
+++ b/include/os/linux/spl/sys/signal.h
@@ -25,10 +25,7 @@
 #define	_SPL_SIGNAL_H
 
 #include <linux/sched.h>
-
-#ifdef HAVE_SCHED_SIGNAL_HEADER
 #include <linux/sched/signal.h>
-#endif
 
 extern int issig(void);
 
diff --git a/module/os/linux/spl/spl-condvar.c b/module/os/linux/spl/spl-condvar.c
index c44cc018b..1cb0aeebc 100644
--- a/module/os/linux/spl/spl-condvar.c
+++ b/module/os/linux/spl/spl-condvar.c
@@ -31,10 +31,7 @@
 #include <linux/mod_compat.h>
 
 #include <linux/sched.h>
-
-#ifdef HAVE_SCHED_SIGNAL_HEADER
 #include <linux/sched/signal.h>
-#endif
 
 #define	MAX_HRTIMEOUT_SLACK_US	1000
 static unsigned int spl_schedule_hrtimeout_slack_us = 0;