From fd643704d106bab14e1477773341a7035117702b Mon Sep 17 00:00:00 2001
From: mark <mark@NetBSD.org>
Date: Mon, 6 Jan 1997 04:47:53 +0000
Subject: [PATCH] Minor changes (inline -> __inline))

---
 sys/arch/arm32/arm32/clock.c           |  4 ++--
 sys/arch/arm32/arm32/machdep.c         | 12 ++++++------
 sys/arch/arm32/arm32/process_machdep.c |  6 +++---
 sys/arch/arm32/dev/pms.c               |  4 ++--
 sys/arch/arm32/dev/rtc.c               |  6 +++---
 sys/arch/arm32/iomd/iomd_clock.c       |  4 ++--
 sys/arch/arm32/mainbus/fd.c            |  4 ++--
 sys/arch/arm32/mainbus/pms.c           |  4 ++--
 sys/arch/arm32/mainbus/rtc.c           |  6 +++---
 sys/arch/arm32/podulebus/ascreg.h      |  4 ++--
 sys/arch/arm32/podulebus/if_eh.c       |  6 +++---
 sys/arch/arm32/podulebus/if_ie.c       |  6 +++---
 12 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/sys/arch/arm32/arm32/clock.c b/sys/arch/arm32/arm32/clock.c
index 25801c0c819f..b2a0a1986705 100644
--- a/sys/arch/arm32/arm32/clock.c
+++ b/sys/arch/arm32/arm32/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.10 1996/10/15 21:35:23 mark Exp $ */
+/* $NetBSD: clock.c,v 1.11 1997/01/06 04:47:53 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -259,7 +259,7 @@ need_proftick(p)
 }
 
 
-static inline int
+static __inline int
 yeartoday(year)
 	int year;
 {
diff --git a/sys/arch/arm32/arm32/machdep.c b/sys/arch/arm32/arm32/machdep.c
index b586a31c3929..198cbd5c8c97 100644
--- a/sys/arch/arm32/arm32/machdep.c
+++ b/sys/arch/arm32/arm32/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.16 1997/01/01 23:40:13 pk Exp $ */
+/* $NetBSD: machdep.c,v 1.17 1997/01/06 04:47:54 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -514,7 +514,7 @@ delay(n)
  * during the bootstrap process.
  */
 
-/*inline*/ void
+/*__inline*/ void
 map_section(pagetable, va, pa)
 	vm_offset_t pagetable;
 	vm_offset_t va;
@@ -527,7 +527,7 @@ map_section(pagetable, va, pa)
 }
 
 
-/*inline*/ void
+/*__inline*/ void
 map_pagetable(pagetable, va, pa)
 	vm_offset_t pagetable;
 	vm_offset_t va;
@@ -542,7 +542,7 @@ map_pagetable(pagetable, va, pa)
 }
 
 
-inline void
+__inline void
 map_entry(pagetable, va, pa)
 	vm_offset_t pagetable;
 	vm_offset_t va;
@@ -553,7 +553,7 @@ map_entry(pagetable, va, pa)
 }
 
 
-inline void
+__inline void
 map_entry_nc(pagetable, va, pa)
 	vm_offset_t pagetable;
 	vm_offset_t va;
@@ -564,7 +564,7 @@ map_entry_nc(pagetable, va, pa)
 }
 
 
-inline void
+__inline void
 map_entry_ro(pagetable, va, pa)
 	vm_offset_t pagetable;
 	vm_offset_t va;
diff --git a/sys/arch/arm32/arm32/process_machdep.c b/sys/arch/arm32/arm32/process_machdep.c
index 7eb46aa3215a..4ca6843cbea5 100644
--- a/sys/arch/arm32/arm32/process_machdep.c
+++ b/sys/arch/arm32/arm32/process_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.4 1996/10/16 19:32:26 ws Exp $ */
+/* $NetBSD: process_machdep.c,v 1.5 1997/01/06 04:47:55 mark Exp $ */
 
 /*
  * Copyright (c) 1995 Frank Lancaster.  All rights reserved.
@@ -77,7 +77,7 @@
 
 #include <machine/reg.h>
 
-static inline struct trapframe *
+static __inline struct trapframe *
 process_frame(p)
 	struct proc *p;
 {
@@ -86,7 +86,7 @@ process_frame(p)
 }
 
 #ifndef ARMFPE
-static inline struct fpe_sp_state *
+static __inline struct fpe_sp_state *
 process_fpframe(p)
 	struct proc *p;
 {
diff --git a/sys/arch/arm32/dev/pms.c b/sys/arch/arm32/dev/pms.c
index d2129d09e035..64f2aa1ea885 100644
--- a/sys/arch/arm32/dev/pms.c
+++ b/sys/arch/arm32/dev/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.8 1996/11/23 03:37:38 mark Exp $ */
+/* $NetBSD: pms.c,v 1.9 1997/01/06 04:47:58 mark Exp $ */
 
 /*-
  * Copyright (c) 1996 D.C. Tsen
@@ -115,7 +115,7 @@ struct cfdriver	pms_cd = {
 
 #define	PMSUNIT(dev)	(minor(dev))
 
-static inline void
+static __inline void
 pms_flush()
 {
 	int n = 1000;
diff --git a/sys/arch/arm32/dev/rtc.c b/sys/arch/arm32/dev/rtc.c
index 5872342b1d0a..84bac88ef2df 100644
--- a/sys/arch/arm32/dev/rtc.c
+++ b/sys/arch/arm32/dev/rtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.5 1996/10/15 19:28:01 mark Exp $ */
+/* $NetBSD: rtc.c,v 1.6 1997/01/06 04:47:59 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -131,14 +131,14 @@ cmos_write(location, value)
 
 /* Hex to BCD and BCD to hex conversion routines */
 
-static inline int
+static __inline int
 hexdectodec(n)
 	u_char n;
 {
 	return(((n >> 4) & 0x0F) * 10 + (n & 0x0F));
 }
 
-static inline int
+static __inline int
 dectohexdec(n)
 	u_char n;
 {
diff --git a/sys/arch/arm32/iomd/iomd_clock.c b/sys/arch/arm32/iomd/iomd_clock.c
index 10c7c1040021..e0e62bc9cc01 100644
--- a/sys/arch/arm32/iomd/iomd_clock.c
+++ b/sys/arch/arm32/iomd/iomd_clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_clock.c,v 1.10 1996/10/15 21:35:23 mark Exp $ */
+/* $NetBSD: iomd_clock.c,v 1.11 1997/01/06 04:47:53 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -259,7 +259,7 @@ need_proftick(p)
 }
 
 
-static inline int
+static __inline int
 yeartoday(year)
 	int year;
 {
diff --git a/sys/arch/arm32/mainbus/fd.c b/sys/arch/arm32/mainbus/fd.c
index f299a06d74dc..1616800d59c1 100644
--- a/sys/arch/arm32/mainbus/fd.c
+++ b/sys/arch/arm32/mainbus/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.16 1997/01/01 23:32:41 pk Exp $	*/
+/*	$NetBSD: fd.c,v 1.17 1997/01/06 04:47:57 mark Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@@ -474,7 +474,7 @@ fd_nvtotype(fdc, nvraminfo, drive)
 	}
 }
 
-inline struct fd_type *
+__inline struct fd_type *
 fd_dev_to_type(fd, dev)
 	struct fd_softc *fd;
 	dev_t dev;
diff --git a/sys/arch/arm32/mainbus/pms.c b/sys/arch/arm32/mainbus/pms.c
index d2129d09e035..64f2aa1ea885 100644
--- a/sys/arch/arm32/mainbus/pms.c
+++ b/sys/arch/arm32/mainbus/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.8 1996/11/23 03:37:38 mark Exp $ */
+/* $NetBSD: pms.c,v 1.9 1997/01/06 04:47:58 mark Exp $ */
 
 /*-
  * Copyright (c) 1996 D.C. Tsen
@@ -115,7 +115,7 @@ struct cfdriver	pms_cd = {
 
 #define	PMSUNIT(dev)	(minor(dev))
 
-static inline void
+static __inline void
 pms_flush()
 {
 	int n = 1000;
diff --git a/sys/arch/arm32/mainbus/rtc.c b/sys/arch/arm32/mainbus/rtc.c
index 5872342b1d0a..84bac88ef2df 100644
--- a/sys/arch/arm32/mainbus/rtc.c
+++ b/sys/arch/arm32/mainbus/rtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.5 1996/10/15 19:28:01 mark Exp $ */
+/* $NetBSD: rtc.c,v 1.6 1997/01/06 04:47:59 mark Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -131,14 +131,14 @@ cmos_write(location, value)
 
 /* Hex to BCD and BCD to hex conversion routines */
 
-static inline int
+static __inline int
 hexdectodec(n)
 	u_char n;
 {
 	return(((n >> 4) & 0x0F) * 10 + (n & 0x0F));
 }
 
-static inline int
+static __inline int
 dectohexdec(n)
 	u_char n;
 {
diff --git a/sys/arch/arm32/podulebus/ascreg.h b/sys/arch/arm32/podulebus/ascreg.h
index dba455eb84a8..599e78715940 100644
--- a/sys/arch/arm32/podulebus/ascreg.h
+++ b/sys/arch/arm32/podulebus/ascreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ascreg.h,v 1.4 1996/03/07 23:54:29 mark Exp $ */
+/* $NetBSD: ascreg.h,v 1.5 1997/01/06 04:48:02 mark Exp $ */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -260,7 +260,7 @@ temphi  = dmac + 0x0218;/*    RO  T15  T14  T13  T12  T11  T10   T9   T8 */
 	ReadSBIC1(sbic_base, a)
 
 
-static inline int
+static __inline int
 ReadSBIC1(sbic_base, a)
 	u_int sbic_base;
 	int a;
diff --git a/sys/arch/arm32/podulebus/if_eh.c b/sys/arch/arm32/podulebus/if_eh.c
index bdd77cd2cc33..bd10f99a61cd 100644
--- a/sys/arch/arm32/podulebus/if_eh.c
+++ b/sys/arch/arm32/podulebus/if_eh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eh.c,v 1.13 1996/10/30 01:50:01 mark Exp $ */
+/* $NetBSD: if_eh.c,v 1.14 1997/01/06 04:48:00 mark Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -692,7 +692,7 @@ eh_transmit_command(sc)
 
 /* We musn't fail */
 
-inline void
+__inline void
 eh_ensure_dma_ok(sc)
 	struct eh_softc *sc;
 {
@@ -713,7 +713,7 @@ eh_ensure_dma_ok(sc)
 	SetReg(EH_COMMAND, 0x22);
 }
 
-inline int
+__inline int
 eh_ensure_dma_completed(sc, type)
 	struct eh_softc *sc;
 	int type;
diff --git a/sys/arch/arm32/podulebus/if_ie.c b/sys/arch/arm32/podulebus/if_ie.c
index fda4567d9254..784d99c35702 100644
--- a/sys/arch/arm32/podulebus/if_ie.c
+++ b/sys/arch/arm32/podulebus/if_ie.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.11 1996/10/14 23:42:17 mark Exp $ */
+/* $NetBSD: if_ie.c,v 1.12 1997/01/06 04:48:01 mark Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -1074,7 +1074,7 @@ command_and_wait(sc, cmd, pscb, pcmd, ocmd, scmd, mask)
 	PWriteShort(sc->sc_ram + IE_COFF2POFF(ptr) +	\
 	       (offsetof(type, member)), dest );
 
-static inline int
+static __inline int
 ie_buflen(sc, head)
 	struct ie_softc *sc;
 	int head;
@@ -1087,7 +1087,7 @@ ie_buflen(sc, head)
 	return(actual & (IE_RXBUF_SIZE | (IE_RXBUF_SIZE-1))) ;
 }
 
-static inline int
+static __inline int
 ie_packet_len(sc)
 	struct ie_softc *sc;
 {