[src/netbsd-7]: src/lib/libc/stdlib Fix merge botch for #1161

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

details:   https://anonhg.NetBSD.org/src/rev/30bdb9ab0585
branches:  netbsd-7
changeset: 799900:30bdb9ab0585
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 10 09:10:11 2016 +0000

description:
Fix merge botch for #1161

diffstat:

 lib/libc/stdlib/jemalloc.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r cae18dd3a34c -r 30bdb9ab0585 lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c        Mon May 09 19:50:05 2016 +0000
+++ b/lib/libc/stdlib/jemalloc.c        Tue May 10 09:10:11 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $    */
+/*     $NetBSD: jemalloc.c,v 1.34.2.3 2016/05/10 09:10:11 martin Exp $ */
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans <jasone%FreeBSD.org@localhost>.
@@ -118,7 +118,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.34.2.3 2016/05/10 09:10:11 martin Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -1651,6 +1651,11 @@
        assert(a != NULL);
        assert(b != NULL);
 
+       if (a->max_frun_npages < b->max_frun_npages)
+               return -1;
+       if (a->max_frun_npages > b->max_frun_npages)
+               return 1;
+
        if ((uintptr_t)a < (uintptr_t)b)
                return (-1);
        else if (a == b)
@@ -1671,11 +1676,6 @@
        assert(a != NULL);
        assert(b != NULL);
 
-       if (a->max_frun_npages < b->max_frun_npages)
-               return -1;
-       if (a->max_frun_npages > b->max_frun_npages)
-               return 1;
-
        if ((uintptr_t)a < (uintptr_t)b)
                return (-1);
        else if (a == b)