From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 17 Mar 2004 23:19:36 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~11127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d9b02a408070f33d20a4f8f650fe729f2d12dcf;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

	* sysdeps/unix/sysv/linux/ia64/ioperm.c (_iopl): Match EPERM error
	the x86 code produces in case of mission permissions.
	Patch by Bernd Schmidt <bernds@redhat.com>.
---

diff --git a/ChangeLog b/ChangeLog
index a2f6dbe..45d6c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-17  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/ia64/ioperm.c (_iopl): Match EPERM error
+	the x86 code produces in case of mission permissions.
+	Patch by Bernd Schmidt <bernds@redhat.com>.
+
 	* resolv/netdb.h: Define AI_IDN_ALLOW_UNASSIGNED,
 	AI_IDN_USE_STD3_ASCII_RULES, NI_IDN_ALLOW_UNASSIGNED, and
 	NI_IDN_USE_STD3_ASCII_RULES.
diff --git a/sysdeps/unix/sysv/linux/ia64/ioperm.c b/sysdeps/unix/sysv/linux/ia64/ioperm.c
index 062ed2e..89a0a36 100644
--- a/sysdeps/unix/sysv/linux/ia64/ioperm.c
+++ b/sysdeps/unix/sysv/linux/ia64/ioperm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
 
@@ -137,7 +137,13 @@ _iopl (unsigned int level)
       return -1;
     }
   if (level)
-    return _ioperm (0, MAX_PORT, 1);
+    {
+      int retval = _ioperm (0, MAX_PORT, 1);
+      /* Match the documented error returns of the x86 version.  */
+      if (retval < 0 && errno == EACCES)
+	__set_errno (EPERM);
+      return retval;
+    }
   return 0;
 }