[src/trunk]: src/sys/arch/x86/x86 Simplify the conditions. Fixes compilation ...

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

details:   https://anonhg.NetBSD.org/src/rev/222e308b66aa
branches:  trunk
changeset: 363962:222e308b66aa
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Aug 18 08:45:55 2018 +0000

description:
Simplify the conditions. Fixes compilation of native amd64 without direct
map.

diffstat:

 sys/arch/x86/x86/pmap.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r e7bcd8679440 -r 222e308b66aa sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Sat Aug 18 08:30:43 2018 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sat Aug 18 08:45:55 2018 +0000
@@ -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 @@
 }
 #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 @@
 }
 #endif
 
-#if defined(__HAVE_DIRECT_MAP) || (defined(XEN) && defined(__x86_64__))
+#ifdef __x86_64__
 vaddr_t slotspace_rand(int, size_t, size_t);
 
 /*