summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-08-14 18:54:27 +0000
committerUlrich Drepper <drepper@redhat.com>2007-08-14 18:54:27 +0000
commitc6c8f0eca3745aa53b1045e992e63d7eb0164365 (patch)
tree4660a467c5c6ffc491f1b0478882c45ec86e1a98
parent5e88abf945eeb5338c24a2021bd66650ed86e96f (diff)
* elf/dl-misc.c: Undo last change. The kernel won't allow it.
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-misc.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1795798ef0..51037edf83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-14 Ulrich Drepper <drepper@redhat.com>
+
+ * elf/dl-misc.c: Undo last change. The kernel won't allow it.
+
2007-08-13 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* stdlib/strtold_l.c: Include wchar.h if needed. Add libc_hidden_def.
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index 41da98d729..6da1e2e4aa 100644
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -1,5 +1,5 @@
/* Miscellaneous support functions for dynamic linker
- Copyright (C) 1997-2004, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-2002, 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -55,11 +55,7 @@ _dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
{
void *result = MAP_FAILED;
struct stat64 st;
- int oflags = O_RDONLY;
-#ifdef O_NOATIME
- oflags |= O_NOATIME;
-#endif
- int fd = __open (file, oflags);
+ int fd = __open (file, O_RDONLY);
if (fd >= 0)
{
if (__fxstat64 (_STAT_VER, fd, &st) >= 0)