From 28b16fab95de350c85e35763b9270e392e6030fb Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 20 May 2003 05:05:38 +0000 Subject: [PATCH] STABLE12-linux-look-for-syscall-h-in-kernel-20030519 some new kernels appear not to have linux/syscall.h in the kernel. no clue. (cherry picked from commit 7fa099db6f796eb1eb0528cf8b7b68d27f510dd7) --- acinclude.m4 | 4 ++++ src/afs/LINUX/osi_module.c | 3 +-- src/cf/linux-test3.m4 | 11 +++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 340696980..0cdd2471c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -155,6 +155,7 @@ case $system in LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS LINUX_FS_STRUCT_INODE_HAS_I_DEVICES LINUX_INODE_SETATTR_RETURN_TYPE + LINUX_KERNEL_LINUX_SYSCALL_H LINUX_NEED_RHCONFIG LINUX_RECALC_SIGPENDING_ARG_TYPE LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT @@ -241,6 +242,9 @@ case $system in if test "x$ac_cv_linux_func_recalc_sigpending_takes_void" = "xyes"; then AC_DEFINE(RECALC_SIGPENDING_TAKES_VOID, 1, [define if your recalc_sigpending takes void]) fi + if test "x$ac_linux_syscall" = "xyes" ; then + AC_DEFINE(HAVE_KERNEL_LINUX_SYSCALL_H, 1, [define if your linux kernel has linux/syscall.h]) + fi if test "x$ac_cv_linux_sched_struct_task_struct_has_parent" = "xyes"; then AC_DEFINE(STRUCT_TASK_STRUCT_HAS_PARENT, 1, [define if your struct task_struct has parent]) fi diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c index 5ccf89e91..b017ffa93 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -27,12 +27,11 @@ RCSID("$Header$"); #include #include #endif -#ifndef EXPORTED_SYS_CALL_TABLE +#if !defined(EXPORTED_SYS_CALL_TABLE) && defined(HAVE_KERNEL_LINUX_SYSCALL_H) #include #endif - #ifdef AFS_SPARC64_LINUX24_ENV #define __NR_setgroups32 82 /* This number is not exported for some bizarre reason. */ #endif diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4 index d82c88829..929b17d6e 100644 --- a/src/cf/linux-test3.m4 +++ b/src/cf/linux-test3.m4 @@ -1,3 +1,14 @@ +AC_DEFUN(LINUX_KERNEL_LINUX_SYSCALL_H,[ + AC_MSG_CHECKING(for linux/syscall.h in kernel) + if test -f "${LINUX_KERNEL_PATH}/include/linux/syscall.h"; then + ac_linux_syscall=yes + AC_MSG_RESULT($ac_linux_syscall) + else + ac_linux_syscall=no + AC_MSG_RESULT($ac_linux_syscall) + fi +]) + AC_DEFUN(LINUX_NEED_RHCONFIG,[ RHCONFIG_SP="" RHCONFIG_MP="" -- 2.39.5