Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files needing to be in proper directory path. #11

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Files needing to be in proper directory path. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e06e05
Files needing to be in proper directory path.
jefsmithIBM Feb 1, 2023
5bf9b04
Merge branch 'main' into Fix-Files
jefsmithIBM Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Check_LiS_rebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions head/cmn_err.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@

#include <sys/strport.h>
#include <sys/cmn_err.h>
#include <stdarg.h>
#include <sys/osif.h>
#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022
#include <stdarg.h> /* for va_list */
#endif

/*
* Check to see if the symbols for kernel message level have
Expand Down
4 changes: 4 additions & 0 deletions head/linux-mdep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <linux/blkdev.h>
#else
#include <linux/genhd.h>
#endif
#include <linux/blk_types.h>
#else
#include <linux/fs.h> /* linux file sys externs */
Expand Down
4 changes: 3 additions & 1 deletion head/osif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@
#include <linux/bios32.h> /* old style PCI routines */
#include <linux/mm.h> /* vremap */
#endif
#include <stdarg.h>
#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022
#include <stdarg.h> /* for va_list */
#endif

#define INCL_FROM_OSIF_DRIVER /* do not change routine names */
#include <sys/osif.h>
Expand Down
4 changes: 3 additions & 1 deletion head/queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@

#include <sys/stream.h>
#include <sys/osif.h>
#include <stdarg.h>
#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022
#include <stdarg.h> /* for va_list */
#endif

/* ------------------------------------------------------------------- */
/* Local functions & macros */
Expand Down
5 changes: 3 additions & 2 deletions head/strmdbg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@
#include <sys/stream.h>
#include <sys/poll.h>
#include <sys/lislocks.h>

#include <stdarg.h>
#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022
#include <stdarg.h> /* for va_list */
#endif
#include <sys/osif.h>
#if defined(LINUX) /* Linux kernel version */
#include <sys/lismem.h>
Expand Down
4 changes: 2 additions & 2 deletions head/version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion include/sys/osif.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
#else
#include <generated/autoconf.h>
#endif
#include <stdarg.h> /* for va_list */
#if (defined(RHEL_RELEASE_CODE) && RHEL_RELEASE_CODE < 2305) //For RHEL 9 update 12-2022
#include <stdarg.h> /* for va_list */
#endif
#include <linux/wait.h> /* for struct wait_queue */
#include <linux/timer.h> /* for struct timer_list */
#include <linux/time.h>
Expand Down