OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow variable shift values in mmap2.

This commit is contained in:
Ulrich Drepper 2010-03-24 14:59:43 -07:00
parent 7749bf5fe6
commit 085f930b8f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-03-24 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/mmap64.c: Allow variable shift values.
2010-03-24 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/multiarch/strpbrk-c.c: Define only if SHARED

21
sysdeps/unix/sysv/linux/mmap64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999,2000,2001,2002,2006 Free Software Foundation, Inc.
/* Copyright (C) 1999,2000,2001,2002,2006,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
@ -30,8 +30,13 @@
#ifdef __NR_mmap2
/* This is always 12, even on architectures where PAGE_SHIFT != 12. */
# ifndef MMAP2_PAGE_SHIFT
# define MMAP2_PAGE_SHIFT 12
# if MMAP2_PAGE_SHIFT == -1
static int page_shift;
# else
# ifndef MMAP2_PAGE_SHIFT
# define MMAP2_PAGE_SHIFT 12
# endif
# define page_shift MMAP2_PAGE_SHIFT
# endif
# ifndef __ASSUME_MMAP2_SYSCALL
@ -44,7 +49,15 @@ void *
__mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset)
{
#ifdef __NR_mmap2
if (offset & ((1 << MMAP2_PAGE_SHIFT) - 1))
# ifdef MMAP2_PAGE_SHIFT == -1
if (page_shift == 0)
{
int page_size = getpagesize ();
while ((1 << ++page_shift) != page_size)
;
}
# endif
if (offset & ((1 << page_shift) - 1))
{
__set_errno (EINVAL);
return MAP_FAILED;