AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ARM ioperm implementation

Browse Source 
Since GLIBC requires a minimum 2.6.32 kernel, the patch cleanups
the ARM ioperm by removing pre-2.4.23 kernel support.
This commit is contained in:
Aurelien Jarno 2015-12-11 22:16:34 +01:00
parent 976ef87054
commit 5db0877750
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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):

11
sysdeps/unix/sysv/linux/arm/ioperm.c
View File

@ -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)