From 70f95ad1b60e4279bd1c6dd51b832eb3e2e36c15 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 19 Nov 2016 11:09:06 +0100
Subject: [PATCH] i386 removal, part 61/x: Adjust some further #ifdefs.

---
 lib/libc/gmon/gmon.c                   | 2 +-
 sys/dev/misc/atkbdc_layer/atkbdc_isa.c | 4 ++--
 sys/dev/misc/kbd/atkbdc.c              | 4 ++--
 sys/dev/netif/mxge/if_mxge.c           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 4a7293cc39..ec6a0e2c7c 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -46,7 +46,7 @@
 
 #include "libc_private.h"
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 extern char *minbrk __asm (".minbrk");
 #else
 extern char *minbrk __asm ("minbrk");
diff --git a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c
index fa17759822..d79669e423 100644
--- a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c
+++ b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c
@@ -108,7 +108,7 @@ atkbdc_probe(device_t dev)
 	struct resource	*port1;
 	int		error;
 	int		rid;
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	bus_space_tag_t	tag;
 	bus_space_handle_t ioh1;
 	volatile int	i;
@@ -138,7 +138,7 @@ atkbdc_probe(device_t dev)
 		return ENXIO;
 	}
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	/*
 	 * Check if we really have AT keyboard controller. Poll status
 	 * register until we get "all clear" indication. If no such
diff --git a/sys/dev/misc/kbd/atkbdc.c b/sys/dev/misc/kbd/atkbdc.c
index 86b445fbc5..e970ca9c66 100644
--- a/sys/dev/misc/kbd/atkbdc.c
+++ b/sys/dev/misc/kbd/atkbdc.c
@@ -185,7 +185,7 @@ atkbdc_configure(void)
 	bus_space_handle_t h1;
 	int port0;
 	int port1;
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	int i;
 #endif
 
@@ -211,7 +211,7 @@ atkbdc_configure(void)
 	h1 = (bus_space_handle_t)port1;
 #endif
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	/*
 	 * Check if we really have AT keyboard controller. Poll status
 	 * register until we get "all clear" indication. If no such
diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index f6d63ed5cc..419cdfdfb3 100644
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -77,7 +77,7 @@ $FreeBSD: head/sys/dev/mxge/if_mxge.c 254263 2013-08-12 23:30:01Z scottl $
 #include <vm/vm.h>		/* for pmap_mapdev() */
 #include <vm/pmap.h>
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 #include <machine/specialreg.h>
 #endif
 
@@ -196,7 +196,7 @@ mxge_probe(device_t dev)
 static void
 mxge_enable_wc(mxge_softc_t *sc)
 {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	vm_offset_t len;
 
 	sc->wc = 1;
@@ -292,7 +292,7 @@ abort:
 	return ENXIO;
 }
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 
 static void
 mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
@@ -416,7 +416,7 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
 	}
 }
 
-#else	/* __i386__ || __x86_64__ */
+#else	/* __x86_64__ */
 
 static void
 mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
-- 
2.11.4.GIT