svn commit: r205063 - in head/sys: amd64/amd64 i386/i386

[John Baldwin]

Author: jhb
Date: Fri Mar 12 03:08:47 2010
New Revision: 205063
URL: http://svn.freebsd.org/changeset/base/205063

Log:
  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.

Modified:
  head/sys/amd64/amd64/pmap.c
  head/sys/i386/i386/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Fri Mar 12 02:56:49 2010	(r205062)
+++ head/sys/amd64/amd64/pmap.c	Fri Mar 12 03:08:47 2010	(r205063)
@@ -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

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Fri Mar 12 02:56:49 2010	(r205062)
+++ head/sys/i386/i386/pmap.c	Fri Mar 12 03:08:47 2010	(r205063)
@@ -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