This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Cleanup ARM ioperm implementation
- From: Aurelien Jarno <aurelien at aurel32 dot net>
- To: libc-alpha at sourceware dot org
- Cc: Aurelien Jarno <aurelien at aurel32 dot net>
- Date: Fri, 11 Dec 2015 23:32:51 +0100
- Subject: [PATCH] Cleanup ARM ioperm implementation
- Authentication-results: sourceware.org; auth=none
Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups
the ARM ioperm by removing pre-2.4.23 kernel support.
---
ChangeLog | 9 +++++++++
sysdeps/unix/sysv/linux/arm/ioperm.c | 11 ++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4bda934..13be8a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-12-11 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/arm/ioperm.c: Do not include
+ <linux/version.h>.
+ [LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,23)]: Remove
+ conditional code.
+ (init_iosys): Use CTL_BUS_ISA instead of BUS_ISA in iobase_name
+ and ioshift_name initialization.
+
2015-12-11 Steve Ellcey <sellcey@imgtec.com>
* sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
diff --git a/sysdeps/unix/sysv/linux/arm/ioperm.c b/sysdeps/unix/sysv/linux/arm/ioperm.c
index 2291def..053d53b 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)
--
2.1.4