From 62a59e8f0d8a1076a12c10e53fe7ab09ca3a05c6 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 8 Mar 2006 06:31:46 +0000
Subject: [PATCH] Remove leading __ from __(inline|const|signed|volatile). 
 They are obsolete.  This should reduce diffs to NetBSD as well.

---
 sys/vm/swap_pager.c | 2 +-
 sys/vm/vm_fault.c   | 4 ++--
 sys/vm/vm_map.c     | 6 +++---
 sys/vm/vm_page.c    | 6 +++---
 sys/vm/vm_pageq.c   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 1dfa279d979..e34e3364b07 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1588,7 +1588,7 @@ swap_pager_isswapped(vm_object_t object, struct swdevt *sp)
  *	XXX - The code to page the whole block in doesn't work, so we
  *	      revert to the one-by-one behavior for now.  Sigh.
  */
-static __inline void
+static inline void
 swp_pager_force_pagein(vm_object_t object, vm_pindex_t pindex)
 {
 	vm_page_t m;
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index a716315f959..7417fc1c420 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -130,7 +130,7 @@ struct faultstate {
 	struct vnode *vp;
 };
 
-static __inline void
+static inline void
 release_page(struct faultstate *fs)
 {
 	vm_page_lock_queues();
@@ -140,7 +140,7 @@ release_page(struct faultstate *fs)
 	fs->m = NULL;
 }
 
-static __inline void
+static inline void
 unlock_map(struct faultstate *fs)
 {
 	if (fs->lookup_still_valid) {
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 23fc7b4742b..d57fca87352 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -280,7 +280,7 @@ vm_init2(void)
 	    vmspace_zinit, vmspace_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
 }
 
-static __inline void
+static inline void
 vmspace_dofree(struct vmspace *vm)
 {
 	CTR1(KTR_VM, "vmspace_free: %p", vm);
@@ -560,7 +560,7 @@ vm_map_entry_create(vm_map_t map)
  *	Set the expected access behavior, either normal, random, or
  *	sequential.
  */
-static __inline void
+static inline void
 vm_map_entry_set_behavior(vm_map_entry_t entry, u_char behavior)
 {
 	entry->eflags = (entry->eflags & ~MAP_ENTRY_BEHAV_MASK) |
@@ -572,7 +572,7 @@ vm_map_entry_set_behavior(vm_map_entry_t entry, u_char behavior)
  *
  *	Set the max_free field in a vm_map_entry.
  */
-static __inline void
+static inline void
 vm_map_entry_set_max_free(vm_map_entry_t entry)
 {
 
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index fc2f29a4ff5..f84efa59e7a 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -980,7 +980,7 @@ vm_page_activate(vm_page_t m)
  *	The page queues must be locked.
  *	This routine may not block.
  */
-static __inline void
+static inline void
 vm_page_free_wakeup(void)
 {
 
@@ -1220,7 +1220,7 @@ vm_page_unwire(vm_page_t m, int activate)
  *
  * This routine may not block.
  */
-static __inline void
+static inline void
 _vm_page_deactivate(vm_page_t m, int athead)
 {
 
@@ -1449,7 +1449,7 @@ retrylookup:
  *
  * Inputs are required to range within a page.
  */
-__inline int
+inline int
 vm_page_bits(int base, int size)
 {
 	int first_bit;
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index 82902818247..7d8beade027 100644
--- a/sys/vm/vm_pageq.c
+++ b/sys/vm/vm_pageq.c
@@ -304,7 +304,7 @@ vm_pageq_remove(vm_page_t m)
  *	This routine may only be called from the vm_pageq_find()
  *	function in this file.
  */
-static __inline vm_page_t
+static inline vm_page_t
 _vm_pageq_find(int basequeue, int index)
 {
 	int i;