forked from pool/openafs
d7141e7dbb
- change version to openafs-1.8.12-g... since the new stable release is 1.8.12 - apply intermediate patches for kernel 6.10 * 03b280649f5e22ed74c217d7c98c3416a2fa9052: Linux-6.10: remove includes for asm/ia32_unistd.h * 0f6a3a402f4a66114da9231032bd68cdc4dee7bc: Linux-6.10: Use filemap_alloc_folio when avail * 658942f2791fad5e33ec7542158c16dfc66eed39: Linux-6.10: define a wrapper for vmalloc * d8b56f21994ce66d8daebb7d69e792f34c1a19ed: afs: avoid empty-body warning * 7097eec17bc01bcfc12c4d299136b2d3b94ec3d7: Linux 6.10: Move 'inline' before func return type OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=127
112 lines
3.8 KiB
Plaintext
112 lines
3.8 KiB
Plaintext
commit 03b280649f5e22ed74c217d7c98c3416a2fa9052
|
|
Author: Cheyenne Wills <cwills@sinenomine.net>
|
|
Date: Wed Jun 12 13:56:44 2024 -0600
|
|
|
|
Linux-6.10: remove includes for asm/ia32_unistd.h
|
|
|
|
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.
|
|
|
|
Change-Id: I901b5c0f0ff86272b02f898f3951325533d22f4f
|
|
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>
|
|
|
|
diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c
|
|
index 3e797745c..d964d8103 100644
|
|
--- a/src/afs/LINUX/osi_ioctl.c
|
|
+++ b/src/afs/LINUX/osi_ioctl.c
|
|
@@ -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>
|
|
diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
|
|
index 8ace127f4..499810cc6 100644
|
|
--- a/src/afs/LINUX/osi_module.c
|
|
+++ b/src/afs/LINUX/osi_module.c
|
|
@@ -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>
|
|
diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c
|
|
index ea3d1bd2c..346108489 100644
|
|
--- a/src/afs/LINUX/osi_pag_module.c
|
|
+++ b/src/afs/LINUX/osi_pag_module.c
|
|
@@ -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>
|
|
diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c
|
|
index 9c5a080f0..ad7c695b9 100644
|
|
--- a/src/afs/LINUX/osi_proc.c
|
|
+++ b/src/afs/LINUX/osi_proc.c
|
|
@@ -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>
|