jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LINUX: Stop using linux/config.h

Browse Source 
The linux/config.h header has been useless since Linux 2.6.15 commit
2dd34b488a99135ad2a529e33087ddd6a09e992a ([PATCH] kbuild: permanently
fix kernel configuration include mess).

In Linux 2.6.19 commit 038b0a6d8d32db934bba6a24e74e76e4e327a94f
(Remove all inclusions of <linux/config.h>), included in some RHEL5
kernels, a #warning was added to it, which breaks building with
--enable-checking.

The header was removed entirely in Linux 2.6.20 commit
b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 ([HEADERS] Put linux/config.h
out of its misery.).

Since the header has been unnecessary since 2.6.15, before our Linux
minimum version of 2.6.18, stop checking for the header at all. This
avoids an error with --enable-checking on RHEL5, and gets rid of a
configure-time check.

Change-Id: Ifa2cea7bd2c7911959910bdb8a6a01e0db016dd7
Reviewed-on: https://gerrit.openafs.org/15216
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
This commit is contained in:
Andrew Deason 2022-12-08 20:47:41 -06:00 committed by Michael Meffie
parent 5d48cd523c
commit 1ca9f8b999
5 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/afs/LINUX/osi_probe.c
View File

@ -66,9 +66,6 @@
#define scsi_command_size scsi_command_size_tbl
#endif
#include <linux/sched.h>
#ifdef HAVE_LINUX_CONFIG_H
# include <linux/config.h>
#endif
#include <linux/linkage.h>
#include <linux/init.h>
#include <linux/unistd.h>

3
src/afs/LINUX/osi_sysctl.c
View File

@ -14,9 +14,6 @@
#include "afs/afs_stats.h" /* afs statistics */
#include <linux/sysctl.h>
#ifdef HAVE_LINUX_CONFIG_H
#include <linux/config.h>
#endif
#ifdef CONFIG_SYSCTL

3
src/afs/sysincludes.h
View File

@ -110,9 +110,6 @@
#elif defined(AFS_LINUX_ENV)
# include <linux/version.h>
# ifdef HAVE_LINUX_CONFIG_H
# include <linux/config.h>
# endif
# include <linux/linkage.h>
# include <linux/limits.h>
# include <linux/wait.h>

1
src/cf/linux-kernel-header.m4
View File

@ -1,7 +1,6 @@
AC_DEFUN([OPENAFS_LINUX_KERNEL_HEADER_CHECKS],[
dnl Check for header files
AC_CHECK_LINUX_HEADER([cred.h])
AC_CHECK_LINUX_HEADER([config.h])
AC_CHECK_LINUX_HEADER([exportfs.h])
AC_CHECK_LINUX_HEADER([freezer.h])
AC_CHECK_LINUX_HEADER([key-type.h])

11
src/cf/linux-test3.m4
View File

@ -22,8 +22,6 @@ AC_SUBST(RHCONFIG_MP)
])
dnl This depends on LINUX_CONFIG_H_EXISTS running first!
AC_DEFUN([LINUX_WHICH_MODULES],[
if test "x$enable_redhat_buildsys" = "xyes"; then
MPS=Default
@ -31,18 +29,11 @@ else
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS"
AC_MSG_CHECKING(which kernel modules to build)
if test "x$ac_cv_linux_header_config_h" = "xyes"; then
CPPFLAGS="-DCONFIG_H_EXISTS $CPPFLAGS"
fi
if test "x$ac_linux_rhconfig" = "xyes"; then
MPS="MP SP"
else
AC_CACHE_VAL(ac_cv_linux_config_smp, [
AC_TRY_KBUILD(
[#ifdef CONFIG_H_EXISTS
#include <linux/config.h>
#endif
],
AC_TRY_KBUILD([],
[#ifndef CONFIG_SMP
lose;
#endif