tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove PAGESIZE."

Browse source
This commit is contained in:
Elliott Hughes 2015-07-29 00:09:20 +00:00 committed by Gerrit Code Review
commit 1ff4094a7f
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/malloc_debug_qemu.cpp
View file

@ -612,7 +612,7 @@ extern "C" bool malloc_debug_initialize(HashTable*, const MallocDebug* malloc_di
error_log("Unable to open /dev/qemu_trace"); error_log("Unable to open /dev/qemu_trace");
return false; return false;
} else { } else {
qtrace = mmap(NULL, PAGESIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); qtrace = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
close(fd); close(fd);
if (qtrace == MAP_FAILED) { if (qtrace == MAP_FAILED) {

6
libc/bionic/sysconf.cpp
View file

@ -97,8 +97,10 @@ long sysconf(int name) {
case _SC_ATEXIT_MAX: return LONG_MAX; // Unlimited. case _SC_ATEXIT_MAX: return LONG_MAX; // Unlimited.
case _SC_IOV_MAX: return UIO_MAXIOV; case _SC_IOV_MAX: return UIO_MAXIOV;
case _SC_PAGESIZE: // Fall through, PAGESIZE and PAGE_SIZE always hold the same value. // _SC_PAGESIZE and _SC_PAGE_SIZE are distinct, but return the same value.
case _SC_PAGE_SIZE: return static_cast<long>(getauxval(AT_PAGESZ)); case _SC_PAGESIZE:
case _SC_PAGE_SIZE:
return static_cast<long>(getauxval(AT_PAGESZ));
case _SC_XOPEN_UNIX: return _XOPEN_UNIX; case _SC_XOPEN_UNIX: return _XOPEN_UNIX;
case _SC_AIO_LISTIO_MAX: return _POSIX_AIO_LISTIO_MAX; // Minimum requirement. case _SC_AIO_LISTIO_MAX: return _POSIX_AIO_LISTIO_MAX; // Minimum requirement.

3
libc/include/limits.h
View file

@ -85,9 +85,6 @@
#ifndef PAGE_SIZE #ifndef PAGE_SIZE
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#endif #endif
#ifndef PAGESIZE
#define PAGESIZE PAGE_SIZE
#endif
#define SEM_VALUE_MAX 0x3fffffff #define SEM_VALUE_MAX 0x3fffffff