From 0feb80855dd188df53fc410002fcb3783e20d192 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 25 Sep 2009 14:58:05 +0000
Subject: 2009-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>

	* shared/include/io.h, shared/include/mmu.h: Change extern inline to
	static inline.
---
 c/src/lib/libcpu/powerpc/ChangeLog            |  5 +++++
 c/src/lib/libcpu/powerpc/shared/include/io.h  | 22 +++++++++++-----------
 c/src/lib/libcpu/powerpc/shared/include/mmu.h |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index d1606e1070..e92f1861eb 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-25	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* shared/include/io.h, shared/include/mmu.h: Change extern inline to
+	static inline.
+
 2009-08-27	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* mpc6xx/mmu/bat.c, mpc6xx/mmu/bat.h: Fix spelling.
diff --git a/c/src/lib/libcpu/powerpc/shared/include/io.h b/c/src/lib/libcpu/powerpc/shared/include/io.h
index 8db4e2c499..1b68e069f6 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/io.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/io.h
@@ -51,7 +51,7 @@
  * Acts as a barrier to ensure all previous I/O accesses have
  * completed before any further ones are issued.
  */
-extern inline void eieio(void)
+static inline void eieio(void)
 {
 	__asm__ __volatile__ ("eieio");
 }
@@ -67,7 +67,7 @@ extern inline void eieio(void)
 /*
  * 8, 16 and 32 bit, big and little endian I/O operations, with barrier.
  */
-extern inline int in_8(volatile unsigned char *addr)
+static inline int in_8(volatile unsigned char *addr)
 {
 	int ret;
 
@@ -75,12 +75,12 @@ extern inline int in_8(volatile unsigned char *addr)
 	return ret;
 }
 
-extern inline void out_8(volatile unsigned char *addr, int val)
+static inline void out_8(volatile unsigned char *addr, int val)
 {
 	__asm__ __volatile__("stb%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
 }
 
-extern inline int in_le16(volatile unsigned short *addr)
+static inline int in_le16(volatile unsigned short *addr)
 {
 	int ret;
 
@@ -89,7 +89,7 @@ extern inline int in_le16(volatile unsigned short *addr)
 	return ret;
 }
 
-extern inline int in_be16(volatile unsigned short *addr)
+static inline int in_be16(volatile unsigned short *addr)
 {
 	int ret;
 
@@ -97,18 +97,18 @@ extern inline int in_be16(volatile unsigned short *addr)
 	return ret;
 }
 
-extern inline void out_le16(volatile unsigned short *addr, int val)
+static inline void out_le16(volatile unsigned short *addr, int val)
 {
 	__asm__ __volatile__("sthbrx %1,0,%2; eieio" : "=m" (*addr) :
 			      "r" (val), "r" (addr));
 }
 
-extern inline void out_be16(volatile unsigned short *addr, int val)
+static inline void out_be16(volatile unsigned short *addr, int val)
 {
 	__asm__ __volatile__("sth%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
 }
 
-extern inline unsigned in_le32(volatile unsigned *addr)
+static inline unsigned in_le32(volatile unsigned *addr)
 {
 	unsigned ret;
 
@@ -117,7 +117,7 @@ extern inline unsigned in_le32(volatile unsigned *addr)
 	return ret;
 }
 
-extern inline unsigned in_be32(volatile unsigned *addr)
+static inline unsigned in_be32(volatile unsigned *addr)
 {
 	unsigned ret;
 
@@ -125,13 +125,13 @@ extern inline unsigned in_be32(volatile unsigned *addr)
 	return ret;
 }
 
-extern inline void out_le32(volatile unsigned *addr, int val)
+static inline void out_le32(volatile unsigned *addr, int val)
 {
 	__asm__ __volatile__("stwbrx %1,0,%2; eieio" : "=m" (*addr) :
 			     "r" (val), "r" (addr));
 }
 
-extern inline void out_be32(volatile unsigned *addr, int val)
+static inline void out_be32(volatile unsigned *addr, int val)
 {
 	__asm__ __volatile__("stw%U0%X0 %1,%0; eieio" : "=m" (*addr) : "r" (val));
 }
diff --git a/c/src/lib/libcpu/powerpc/shared/include/mmu.h b/c/src/lib/libcpu/powerpc/shared/include/mmu.h
index 47818a4a0a..c230bf0fac 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/mmu.h
+++ b/c/src/lib/libcpu/powerpc/shared/include/mmu.h
@@ -165,7 +165,7 @@ typedef struct _MMU_context {
 #define HASH_TABLE_MASK_4M	0x03F   
 
 /* invalidate a TLB entry */
-extern inline void _tlbie(unsigned long va)
+static inline void _tlbie(unsigned long va)
 {
 	asm volatile ("tlbie %0" : : "r"(va));
 }
-- 
cgit v1.2.3