Module Name: src
Committed By: maxv
Date: Sat Aug 18 08:45:55 UTC 2018
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
Simplify the conditions. Fixes compilation of native amd64 without direct
map.
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.302 src/sys/arch/x86/x86/pmap.c:1.303
--- src/sys/arch/x86/x86/pmap.c:1.302 Sun Aug 12 15:31:01 2018
+++ src/sys/arch/x86/x86/pmap.c Sat Aug 18 08:45:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.302 2018/08/12 15:31:01 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.303 2018/08/18 08:45:55 maxv Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -157,7 +157,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.302 2018/08/12 15:31:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.303 2018/08/18 08:45:55 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -1375,8 +1375,7 @@ pmap_init_lapic(void)
}
#endif
-#if defined(__HAVE_PCPU_AREA) || defined(__HAVE_DIRECT_MAP) || \
- (defined(XEN) && defined(__x86_64__))
+#ifdef __x86_64__
static size_t
pmap_pagetree_nentries_range(vaddr_t startva, vaddr_t endva, size_t pgsz)
{
@@ -1398,7 +1397,7 @@ slotspace_copy(int type, pd_entry_t *dst
}
#endif
-#if defined(__HAVE_DIRECT_MAP) || (defined(XEN) && defined(__x86_64__))
+#ifdef __x86_64__
vaddr_t slotspace_rand(int, size_t, size_t);
/*
