From 5942207fb4e77898f01ed47b485dddec129fbf2b Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 18:23:43 +0000
Subject: [PATCH] Revert my change; reintroduce __gnu89_inline.

It turns out our compiler in stable/7 can't build this code anymore.
Even though my opinion is that those people should just run `make
kernel-toolchain' before building a kernel, I am willing to wait and
commit this after we've branched stable/8.

Requested by:	rwatson
---
 sys/amd64/amd64/pmap.c | 2 +-
 sys/i386/i386/pmap.c   | 2 +-
 sys/i386/xen/pmap.c    | 2 +-
 sys/sys/cdefs.h        | 6 ++++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 9e472e7aaac2..e152d3ffea91 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -153,7 +153,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 307587a88c4e..5d7dc979a9cd 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -161,7 +161,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c
index 28835963a3de..59947e8245f7 100644
--- a/sys/i386/xen/pmap.c
+++ b/sys/i386/xen/pmap.c
@@ -172,7 +172,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(PMAP_DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 5d413d3710f1..44bed25ecca1 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -234,6 +234,12 @@
 #define	__always_inline
 #endif
 
+#if __GNUC_PREREQ__(4, 2) /* actually 4.1.3 */
+#define	__gnu89_inline	__attribute__((__gnu_inline__)) __inline
+#else
+#define	__gnu89_inline
+#endif
+
 #if __GNUC_PREREQ__(3, 1)
 #define	__noinline	__attribute__ ((__noinline__))
 #else