[src/trunk]: src/external/bsd/jemalloc/dist/src Undo previous, it is moving u...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5dad3ca2ddf
branches:  trunk
changeset: 456184:b5dad3ca2ddf
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 26 14:58:56 2019 +0000

description:
Undo previous, it is moving us in the wrong direction.

diffstat:

 external/bsd/jemalloc/dist/src/pages.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r 34399136bd22 -r b5dad3ca2ddf external/bsd/jemalloc/dist/src/pages.c
--- a/external/bsd/jemalloc/dist/src/pages.c    Fri Apr 26 14:36:40 2019 +0000
+++ b/external/bsd/jemalloc/dist/src/pages.c    Fri Apr 26 14:58:56 2019 +0000
@@ -55,8 +55,8 @@
 
 static void *
 os_pages_map(void *addr, size_t size, size_t alignment, bool *commit) {
-       assert(os_page != PAGE || ALIGNMENT_ADDR2BASE(addr, os_page) == addr);
-       assert(os_page != PAGE || ALIGNMENT_CEILING(size, os_page) == size);
+       assert(ALIGNMENT_ADDR2BASE(addr, os_page) == addr);
+       assert(ALIGNMENT_CEILING(size, os_page) == size);
        assert(size != 0);
 
        if (os_overcommits) {
@@ -135,8 +135,8 @@
 
 static void
 os_pages_unmap(void *addr, size_t size) {
-       assert(os_page != PAGE || ALIGNMENT_ADDR2BASE(addr, os_page) == addr);
-       assert(os_page != PAGE || ALIGNMENT_CEILING(size, os_page) == size);
+       assert(ALIGNMENT_ADDR2BASE(addr, os_page) == addr);
+       assert(ALIGNMENT_CEILING(size, os_page) == size);
 
 #ifdef _WIN32
        if (VirtualFree(addr, 0, MEM_RELEASE) == 0)
@@ -187,7 +187,7 @@
 void *
 pages_map(void *addr, size_t size, size_t alignment, bool *commit) {
        assert(alignment >= PAGE);
-       assert(os_page != PAGE || ALIGNMENT_ADDR2BASE(addr, alignment) == addr);
+       assert(ALIGNMENT_ADDR2BASE(addr, alignment) == addr);
 
        /*
         * Ideally, there would be a way to specify alignment to mmap() (like
@@ -570,7 +570,7 @@
 bool
 pages_boot(void) {
        os_page = os_page_detect();
-       if (os_page < PAGE) {
+       if (os_page > PAGE) {
                malloc_write("<jemalloc>: Unsupported system page size\n");
                if (opt_abort) {
                        abort();