Fix ioctl32 inclusion on Sparc 64

ioctl32.h only became available in Linux 2.5.44, so reduce the scope
of the include. It went away again, in Linux 2.6.22. In its short
life, it only ever provided prototypes for registering translation
handlers, and for sys_ioctl.

Only include it where we call those handlers, and when we call them,
to remove compilation errors for Sparc64.

Change-Id: I7816bd8b1e18ead68f7e5078e684d60bf59ac470
Reviewed-on: http://gerrit.openafs.org/1040
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c
index cb93b96d0790fa160897835fb8f4b260e627884b..5f0a863613d4a3cabb019997f57f4f593464fcf6 100644 (file)
--- a/src/afs/LINUX/osi_ioctl.c
+++ b/src/afs/LINUX/osi_ioctl.c
@@ -24,7 +24,8 @@
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
+
+#if defined(AFS_SPARC64_LINUX26_ENV) && defined(NEED_IOCTL32) && !defined(HAVE_COMPAT_IOCTL)
 #include <linux/ioctl32.h>
 #endif
 

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index e5a25d9e9607632d52240ebd93eb3db4dd5e988f..28c563da84806bc7a7f97b4629f2fa90c835c6b7 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -24,9 +24,6 @@
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-#include <linux/ioctl32.h>
-#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>

diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c
index d390b87ce975465ddeba14146fcaa90f413d3f77..84dcd3524b1e3896e89ec9cf303ca4b35b4b559e 100644 (file)
--- a/src/afs/LINUX/osi_pag_module.c
+++ b/src/afs/LINUX/osi_pag_module.c
@@ -23,9 +23,6 @@
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-#include <linux/ioctl32.h>
-#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>

diff --git a/src/afs/LINUX24/osi_ioctl.c b/src/afs/LINUX24/osi_ioctl.c
index b29c1adb8f3ac35cbb081aa30e6688d05008053b..35ed9675912861d357cb1599a8bf1bead395a897 100644 (file)
--- a/src/afs/LINUX24/osi_ioctl.c
+++ b/src/afs/LINUX24/osi_ioctl.c
@@ -24,9 +24,6 @@
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-#include <linux/ioctl32.h>
-#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>

diff --git a/src/afs/LINUX24/osi_pag_module.c b/src/afs/LINUX24/osi_pag_module.c
index cf1460d7a3015cde1a8218deb753c735393e9767..007c782608266d59f703952e628b7dc1fe3ed9a0 100644 (file)
--- a/src/afs/LINUX24/osi_pag_module.c
+++ b/src/afs/LINUX24/osi_pag_module.c
@@ -23,9 +23,6 @@
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>
 #endif
-#ifdef AFS_SPARC64_LINUX20_ENV
-#include <linux/ioctl32.h>
-#endif
 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>