From: guenther Date: Thu, 30 Dec 2021 08:39:19 +0000 (+0000) Subject: Sync from libc: Use _MAX_PAGE_SHIFT, rather than #ifdef mips64 X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7544b6854ce40eca74e77b9a5e6697618ac6f102;p=openbsd Sync from libc: Use _MAX_PAGE_SHIFT, rather than #ifdef mips64 ok otto@ --- diff --git a/libexec/ld.so/malloc.c b/libexec/ld.so/malloc.c index c5eae02e8f6..8c5f9aea4fa 100644 --- a/libexec/ld.so/malloc.c +++ b/libexec/ld.so/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.32 2021/04/19 06:43:15 otto Exp $ */ +/* $OpenBSD: malloc.c,v 1.33 2021/12/30 08:39:19 guenther Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -33,12 +33,7 @@ #include "archdep.h" #include "resolve.h" -#if defined(__mips64__) -#define MALLOC_PAGESHIFT (14U) -#else -#define MALLOC_PAGESHIFT (PAGE_SHIFT) -#endif - +#define MALLOC_PAGESHIFT _MAX_PAGE_SHIFT #define MALLOC_MINSHIFT 4 #define MALLOC_MAXSHIFT (MALLOC_PAGESHIFT - 1) #define MALLOC_PAGESIZE (1UL << MALLOC_PAGESHIFT)