summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2010-03-12 03:08:47 +0000
committerjhb <jhb@FreeBSD.org>2010-03-12 03:08:47 +0000
commit1fc7a4e7bded730ca621682e4fbe7c80fc8d050d (patch)
tree8863dfaf40e8b5000aa115b91afab235976efb73
parent378ca3a5ee2f392fc8f567764968d46621df5a66 (diff)
downloadFreeBSD-src-1fc7a4e7bded730ca621682e4fbe7c80fc8d050d.zip
FreeBSD-src-1fc7a4e7bded730ca621682e4fbe7c80fc8d050d.tar.gz
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.
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/i386/i386/pmap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 0be5e29..a503069 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 f448071..98b6151 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
OpenPOWER on IntegriCloud