From 43f48b65c07e1b4337346cba5d51a3af75b7ae13 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 16 Nov 2012 05:55:56 +0000
Subject: [PATCH] Move the declaration of vm_phys_paddr_to_vm_page() from
 vm/vm_page.h to vm/vm_phys.h, where it belongs.

Requested and reviewed by:	alc
MFC after:	2 weeks
---
 sys/amd64/amd64/minidump_machdep.c | 1 +
 sys/arm/arm/pmap.c                 | 1 +
 sys/sparc64/sparc64/pmap.c         | 1 +
 sys/vm/device_pager.c              | 1 +
 sys/vm/sg_pager.c                  | 1 +
 sys/vm/vm_page.h                   | 2 --
 sys/vm/vm_phys.h                   | 1 +
 7 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 9be642e6c77a..c1b03c1f5c96 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
+#include <vm/vm_phys.h>
 #include <vm/pmap.h>
 #include <machine/atomic.h>
 #include <machine/elf.h>
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index 3d809aab9a81..6a794b718e45 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -165,6 +165,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
+#include <vm/vm_phys.h>
 #include <vm/vm_extern.h>
 
 #include <machine/md_var.h>
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index d20d69fde1cb..08f008c89167 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_phys.h>
 
 #include <machine/cache.h>
 #include <machine/frame.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 546c9bd807c9..ba70571f27bd 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_phys.h>
 #include <vm/uma.h>
 
 static void dev_pager_init(void);
diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c
index c8b14bdb9561..097039ecc17e 100644
--- a/sys/vm/sg_pager.c
+++ b/sys/vm/sg_pager.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_phys.h>
 #include <vm/uma.h>
 
 static vm_object_t sg_pager_alloc(void *, vm_ooffset_t, vm_prot_t,
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 58d86b9b7d40..f8a4f707dd5c 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -324,8 +324,6 @@ extern long first_page;			/* first physical page number */
 
 #define VM_PAGE_TO_PHYS(entry)	((entry)->phys_addr)
 
-vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
-
 vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa);
 
 /* page allocation classes: */
diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h
index 902659b5b255..7b7b33be6984 100644
--- a/sys/vm/vm_phys.h
+++ b/sys/vm/vm_phys.h
@@ -64,6 +64,7 @@ vm_page_t vm_phys_fictitious_to_vm_page(vm_paddr_t pa);
 void vm_phys_free_contig(vm_page_t m, u_long npages);
 void vm_phys_free_pages(vm_page_t m, int order);
 void vm_phys_init(void);
+vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
 void vm_phys_set_pool(int pool, vm_page_t m, int order);
 boolean_t vm_phys_unfree_page(vm_page_t m);
 boolean_t vm_phys_zero_pages_idle(void);