diff --git a/Check_LiS_rebuild.sh b/Check_LiS_rebuild.sh new file mode 100755 index 0000000..d402119 --- /dev/null +++ b/Check_LiS_rebuild.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2022 - IBM Inc. All rights reserved +# SPDX-License-Identifier: LGPL-2.1 +# +# Test of streams driver exists +# +ls -l /lib/modules/`uname -r`/misc | grep streams.ko >/dev/null 2>&1 +if [ $? = 0 ] +then + echo " LiS is up to date" +else + echo " LiS needs to be built" + cd /usr/src/LiS + make uninstall + make very-clean + ./buildLiS +fi diff --git a/head/cmn_err.c b/head/cmn_err.c index 7e6ea97..ce6867a 100644 --- a/head/cmn_err.c +++ b/head/cmn_err.c @@ -38,8 +38,9 @@ #include #include -#include -#include +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022 +#include /* for va_list */ +#endif /* * Check to see if the symbols for kernel message level have diff --git a/head/linux-mdep.c b/head/linux-mdep.c index 2fbbc4f..3c62a89 100644 --- a/head/linux-mdep.c +++ b/head/linux-mdep.c @@ -83,7 +83,11 @@ /* In RHEL 8.5, 4.18.0-348 kernel moved definition for __invalidate_device() */ #if ((defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= 2053) || \ (LINUX_VERSION_CODE > KERNEL_VERSION(4,18,0))) +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE >= 2305) //For RHEL 9 update 12-2022 +#include +#else #include +#endif #include #else #include /* linux file sys externs */ diff --git a/head/osif.c b/head/osif.c index af809fe..0b59151 100644 --- a/head/osif.c +++ b/head/osif.c @@ -81,7 +81,9 @@ #include /* old style PCI routines */ #include /* vremap */ #endif -#include +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022 +#include /* for va_list */ +#endif #define INCL_FROM_OSIF_DRIVER /* do not change routine names */ #include diff --git a/head/queue.c b/head/queue.c index bef647b..1e5879b 100644 --- a/head/queue.c +++ b/head/queue.c @@ -44,7 +44,9 @@ #include #include -#include +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022 +#include /* for va_list */ +#endif /* ------------------------------------------------------------------- */ /* Local functions & macros */ diff --git a/head/strmdbg.c b/head/strmdbg.c index 2bfcbc2..bbaee8a 100644 --- a/head/strmdbg.c +++ b/head/strmdbg.c @@ -34,8 +34,9 @@ #include #include #include - -#include +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022 +#include /* for va_list */ +#endif #include #if defined(LINUX) /* Linux kernel version */ #include diff --git a/head/version.c b/head/version.c index c203d7c..5a2509f 100644 --- a/head/version.c +++ b/head/version.c @@ -34,11 +34,11 @@ * */ -#ident "@(#) CSLiS version.c 7.11 2022-10-26 15:30:00 " +#ident "@(#) CSLiS version.c 7.11 2023-02-01 13:30:00 " char lis_version[] = "CS71100" ; -char lis_date[] = "07 N0v 22" ; +char lis_date[] = "01 Feb 23" ; #if 0 diff --git a/include/sys/osif.h b/include/sys/osif.h index 94cc0f8..9d45c83 100644 --- a/include/sys/osif.h +++ b/include/sys/osif.h @@ -29,7 +29,9 @@ #else #include #endif -#include /* for va_list */ +#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022 +#include /* for va_list */ +#endif #include /* for struct wait_queue */ #include /* for struct timer_list */ #include