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-6.10: remove includes for asm/ia32_unistd.h

Browse Source 
The Linux 6.10 commit:
    "x86/syscall/compat: Remove ia32_unistd.h" (e2d168328e)

Removed the header ia32_unistd.h since it was just a wrapper for the
unistd_32_ia32.h.

The commit:
    "linux-afs-translator-xen-20060731" (29dd792381)
added an ia32_unistd.h include to several files; all were not needed
(as they didn't reference any of the contents from the header file, e.g
_NR_ia32_*).

The commit:
    "amd64-hook-ia32-table-20030519" (831e172463)
added an include for ia32_unistd.h to osi_module.c.

A later commit:
    "osi-probe-syscall-20050129" (f126dbdbe2)
removed many of the references to defines from ia32_unistd.h, but did
not remove the include for the header.

Currently the only remaining files (linux-kernel-syscall-probe.m4,
LINUX/osi_probe.c and LINUX/osi_syscall.c) continue to reference the
items from ia32_unistd.h, but only when building older kernels that
either don't have LINUX_KEYRING_SUPPORT or when
ENABLE_LINUX_SYSCALL_PROBING is enabled (in both cases, these are only
applicable for older kernels where the asm/ia32_unistd.h file would be
present).

For the files that don't have references (i.e. _NR_ia32_*), we can
simply remove the include for asm/ia32_unistd.h.  For the remaining set
of files, we can leave the include for asm/ia32_unistd.h since the code
already has preprocessor conditionals so it's only included for older
Linux kernels where the header file will be present.

We noted above, the include for asm/ia32_unistd.h is already conditional
on the checks for LINUX_KEYRING_SUPPORT and ENABLE_LINUX_SYSCALL_PROBING
so we do not need to add any additional configure checks.

Reviewed-on: https://gerrit.openafs.org/15763
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
(cherry picked from commit 03b280649f)

Change-Id: Ifdd7c831e46796a3c3f1f80c973f4319dc791ecc
Reviewed-on: https://gerrit.openafs.org/15798
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Cheyenne Wills 2024-06-12 13:56:44 -06:00 committed by Benjamin Kaduk
parent f1b890fbb9
commit f08f7e821a
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/afs/LINUX/osi_ioctl.c
View File

@ -21,10 +21,6 @@
#include <linux/unistd.h> /* For syscall numbers. */
#include <linux/mm.h>
#ifdef AFS_AMD64_LINUX_ENV
#include <asm/ia32_unistd.h>
#endif
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/sched.h>

4
src/afs/LINUX/osi_module.c
View File

@ -21,10 +21,6 @@
#include <linux/unistd.h> /* For syscall numbers. */
#include <linux/mm.h>
#ifdef AFS_AMD64_LINUX_ENV
#include <asm/ia32_unistd.h>
#endif
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/init.h>

4
src/afs/LINUX/osi_pag_module.c
View File

@ -20,10 +20,6 @@
#include <linux/unistd.h> /* For syscall numbers. */
#include <linux/mm.h>
#ifdef AFS_AMD64_LINUX_ENV
#include <asm/ia32_unistd.h>
#endif
#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/init.h>

4
src/afs/LINUX/osi_proc.c
View File

@ -25,10 +25,6 @@
#include <linux/unistd.h> /* For syscall numbers. */
#include <linux/mm.h>
#ifdef AFS_AMD64_LINUX_ENV
# include <asm/ia32_unistd.h>
#endif
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/sched.h>