summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt <>2018-03-05 01:32:32 +0000
committerderaadt <>2018-03-05 01:32:32 +0000
commitf60664101c06d715133b8cc056cc40f403aeab71 (patch)
tree47e48aa887316ae22e3a9fb94bd4371cc34a7454
parentda5d3c3e9e3e6e4745c32fe969554470335a4abe (diff)
downloadopenbsd-f60664101c06d715133b8cc056cc40f403aeab71.tar.gz
openbsd-f60664101c06d715133b8cc056cc40f403aeab71.tar.bz2
openbsd-f60664101c06d715133b8cc056cc40f403aeab71.zip
Use _MAX_PAGE_SHIFT, rather than #ifdef mips64
ok guenther kettenis
-rw-r--r--src/lib/libc/stdlib/malloc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 346fa55267..9843cab838 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.245 2018/02/07 18:58:30 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.246 2018/03/05 01:32:32 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -46,11 +46,7 @@
46#include "thread_private.h" 46#include "thread_private.h"
47#include <tib.h> 47#include <tib.h>
48 48
49#if defined(__mips64__) 49#define MALLOC_PAGESHIFT _MAX_PAGE_SHIFT
50#define MALLOC_PAGESHIFT (14U)
51#else
52#define MALLOC_PAGESHIFT (PAGE_SHIFT)
53#endif
54 50
55#define MALLOC_MINSHIFT 4 51#define MALLOC_MINSHIFT 4
56#define MALLOC_MAXSHIFT (MALLOC_PAGESHIFT - 1) 52#define MALLOC_MAXSHIFT (MALLOC_PAGESHIFT - 1)