GNU C Library master sources branch master updated. glibc-2.18-698-gfe1a83a

[vapier at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  fe1a83aa1cbe166f8534925103c8d3a4f047f26c (commit)
      from  41b1792698a335d3a85381921a84a16e9635f36a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fe1a83aa1cbe166f8534925103c8d3a4f047f26c

commit fe1a83aa1cbe166f8534925103c8d3a4f047f26c
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue Dec 24 05:33:28 2013 -0500

    ia64: ioperm: clean up long dead code
    
    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>

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 756664c..0338047 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,5 +1,9 @@
 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.
 
 2013-12-24  Mike Frysinger  <vapier@gentoo.org>
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/ioperm.c b/ports/sysdeps/unix/sysv/linux/ia64/ioperm.c
index 83fc557..6a8d17c 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/ioperm.c
+++ b/ports/sysdeps/unix/sysv/linux/ia64/ioperm.c
@@ -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

-----------------------------------------------------------------------

Summary of changes:
 ports/ChangeLog.ia64                        |    4 ++++
 ports/sysdeps/unix/sysv/linux/ia64/ioperm.c |   23 ++++-------------------
 2 files changed, 8 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources