From 55c4e016021f9270244fd90003c8d25af06ea11c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 12 Mar 2010 03:08:47 +0000
Subject: [PATCH] Fix the previous attempt to fix kernel builds of HEAD on 7.x.
  Use the __gnu_inline__ attribute for PMAP_INLINE when using the 7.x compiler
 to match what 7.x uses for PMAP_INLINE.

---
 sys/amd64/amd64/pmap.c | 2 +-
 sys/i386/i386/pmap.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 0be5e29dd3f..a50306930cc 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -152,7 +152,7 @@ __FBSDID("$FreeBSD$");
 
 #if !defined(DIAGNOSTIC)
 #ifdef __GNUC_GNU_INLINE__
-#define PMAP_INLINE	inline
+#define PMAP_INLINE	__attribute__((__gnu_inline__)) inline
 #else
 #define PMAP_INLINE	extern inline
 #endif
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index f448071ef22..98b61519c61 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -163,7 +163,7 @@ __FBSDID("$FreeBSD$");
 
 #if !defined(DIAGNOSTIC)
 #ifdef __GNUC_GNU_INLINE__
-#define PMAP_INLINE	inline
+#define PMAP_INLINE	__attribute__((__gnu_inline__)) inline
 #else
 #define PMAP_INLINE	extern inline
 #endif