about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2015-12-11 22:16:34 +0100
committerAurelien Jarno <aurelien@aurel32.net>2015-12-12 11:52:06 +0100
commit5db0877750f1e2a1983e1f5e43bd0cc68058f684 (patch)
tree06feaca8d07190fe76c457d7bfdb221eb8225fea /sysdeps/unix
parent976ef870542580cf5fed896c2c652b3e1a95f9da (diff)
downloadglibc-5db0877750f1e2a1983e1f5e43bd0cc68058f684.tar.gz
glibc-5db0877750f1e2a1983e1f5e43bd0cc68058f684.tar.xz
glibc-5db0877750f1e2a1983e1f5e43bd0cc68058f684.zip
Cleanup ARM ioperm implementation
Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups
the ARM ioperm by removing pre-2.4.23 kernel support.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/arm/ioperm.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/ioperm.c b/sysdeps/unix/sysv/linux/arm/ioperm.c
index 2291defc92..053d53b3f6 100644
--- a/sysdeps/unix/sysv/linux/arm/ioperm.c
+++ b/sysdeps/unix/sysv/linux/arm/ioperm.c
@@ -43,7 +43,6 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-#include <linux/version.h>
 #include <sys/sysctl.h>
 
 #define PATH_ARM_SYSTYPE	"/etc/arm_systype"
@@ -94,19 +93,13 @@ static struct platform {
  *    values.
  */
 
-/* The Linux kernel headers renamed this constant between 2.5.26 and
-   2.5.27.  It was backported to 2.4 between 2.4.22 and 2.4.23.  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)
-# define BUS_ISA CTL_BUS_ISA
-#endif
-
 static int
 init_iosys (void)
 {
   char systype[256];
   int i, n;
-  static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE };
-  static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT };
+  static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE };
+  static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
   size_t len = sizeof(io.base);
 
   if (! __sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)