system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

ia64: ioperm: clean up long dead code

Browse Source 
This file has a few #if 0 code paths which cause a build time warning:
ports/sysdeps/unix/sysv/linux/ia64/ioperm.c:66:7: warning:
	variable 'prot' set but not used [-Wunused-but-set-variable]

Rather than add more #if 0 around that variable, just delete the code
altogether.  Not like it's going to ever be implemented.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2013-12-24 05:33:28 -05:00
parent 41b1792698
commit fe1a83aa1c
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ChangeLog.ia64
View File

@ -1,3 +1,7 @@
2013-12-24 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/ia64/ioperm.c: Delete code behind #if 0.
2013-12-24 Mike Frysinger <vapier@gentoo.org>
* sysdeps/ia64/sotruss-lib.c: New file.

23
ports/sysdeps/unix/sysv/linux/ia64/ioperm.c
View File

@ -59,11 +59,7 @@ io_offset (unsigned long int port)
int
_ioperm (unsigned long int from, unsigned long int num, int turn_on)
{
#if 0
unsigned long int addr, len, base;
#endif
unsigned long int base;
int prot;
/* this test isn't as silly as it may look like; consider overflows! */
if (from >= MAX_PORT || from + num > MAX_PORT)
@ -91,14 +87,9 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on)
return -1;
len = io_offset (MAX_PORT);
#if 1
/* see comment below */
base = (unsigned long int) __mmap (0, len, PROT_READ | PROT_WRITE, MAP_SHARED,
fd, phys_io_base);
#else
base = (unsigned long int) __mmap (0, len, PROT_NONE, MAP_SHARED,
fd, phys_io_base);
#endif
__close (fd);
if ((long) base == -1)
@ -106,25 +97,19 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on)
io.base = base;
}
prot = PROT_READ | PROT_WRITE;
}
else
{
if (!io.base)
return 0; /* never was turned on... */
prot = PROT_NONE;
}
#if 0
/* We can't do mprotect because that would cause us to lose the
uncached flag that the /dev/mem driver turned on. A MAP_UNCACHED
flag seems so much cleaner... */
addr = (io.base + io_offset (from)) & io.page_mask;
len = io.base + io_offset (from + num) - addr;
return mprotect ((void *) addr, len, prot);
#else
flag seems so much cleaner...
See the history of this file for a version that tried mprotect. */
return 0;
#endif
}
int