Use vm_paddr_t for physical addresses.

9 files changed, 31 insertions, 31 deletions

diff --git a/sys/sparc64/include/cache.h b/sys/sparc64/include/cache.h
index 68b88c748d8e..8708cb4b51f3 100644
--- a/sys/sparc64/include/cache.h
+++ b/sys/sparc64/include/cache.h
@@ -95,15 +95,15 @@ struct cacheinfo {
 	u_int	ec_l2linesize;
 };
 
-typedef void dcache_page_inval_t(vm_offset_t pa);
-typedef void icache_page_inval_t(vm_offset_t pa);
+typedef void dcache_page_inval_t(vm_paddr_t pa);
+typedef void icache_page_inval_t(vm_paddr_t pa);
 
 void	cache_init(phandle_t node);
 
-void	cheetah_dcache_page_inval(vm_offset_t pa);
-void	cheetah_icache_page_inval(vm_offset_t pa);
-void	spitfire_dcache_page_inval(vm_offset_t pa);
-void	spitfire_icache_page_inval(vm_offset_t pa);
+dcache_page_inval_t cheetah_dcache_page_inval;
+icache_page_inval_t cheetah_icache_page_inval;
+dcache_page_inval_t spitfire_dcache_page_inval;
+icache_page_inval_t spitfire_icache_page_inval;
 
 extern dcache_page_inval_t *dcache_page_inval;
 extern icache_page_inval_t *icache_page_inval;
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 3c9982262090..6638ce81e428 100644
--- a/sys/sparc64/include/iommuvar.h
+++ b/sys/sparc64/include/iommuvar.h
@@ -47,7 +47,7 @@ struct iommu_state {
 	u_int64_t		is_dvmabase;
 	int64_t			is_cr;		/* IOMMU control register value */
 
-	vm_offset_t		is_flushpa[2];
+	vm_paddr_t		is_flushpa[2];
 	volatile int64_t	*is_flushva[2];
 	/*
 	 * When a flush is completed, 64 bytes will be stored at the given
@@ -77,7 +77,7 @@ struct iommu_state {
 /* interfaces for PCI/SBUS code */
 void iommu_init(char *, struct iommu_state *, int, u_int32_t, int);
 void iommu_reset(struct iommu_state *);
-void iommu_enter(struct iommu_state *, vm_offset_t, vm_offset_t, int);
+void iommu_enter(struct iommu_state *, vm_offset_t, vm_paddr_t, int);
 void iommu_remove(struct iommu_state *, vm_offset_t, size_t);
 void iommu_decode_fault(struct iommu_state *, vm_offset_t);
 
diff --git a/sys/sparc64/include/kerneldump.h b/sys/sparc64/include/kerneldump.h
index 9ee7db509b3f..7fad3fce88dd 100644
--- a/sys/sparc64/include/kerneldump.h
+++ b/sys/sparc64/include/kerneldump.h
@@ -29,7 +29,7 @@
 #define	_MACHINE_KERNELDUMP_H_
 
 struct sparc64_dump_reg {
-	vm_offset_t	dr_pa;
+	vm_paddr_t	dr_pa;
 	vm_offset_t	dr_size;
 	vm_offset_t	dr_offs;
 };
@@ -41,7 +41,7 @@ struct sparc64_dump_reg {
  */
 struct sparc64_dump_hdr {
 	vm_offset_t	dh_hdr_size;
-	vm_offset_t	dh_tsb_pa;
+	vm_paddr_t	dh_tsb_pa;
 	vm_size_t	dh_tsb_size;
 	vm_size_t	dh_tsb_mask;
 	int		dh_nregions;
diff --git a/sys/sparc64/include/md_var.h b/sys/sparc64/include/md_var.h
index e8bd2d90e0b5..4cf034882ffa 100644
--- a/sys/sparc64/include/md_var.h
+++ b/sys/sparc64/include/md_var.h
@@ -42,7 +42,7 @@ extern	char	_end[];
 extern	long	Maxmem;
 
 extern	vm_offset_t kstack0;
-extern	vm_offset_t kstack0_phys;
+extern	vm_paddr_t kstack0_phys;
 
 struct	pcpu;
 
@@ -50,7 +50,7 @@ void	cpu_halt(void);
 void	cpu_identify(u_long vers, u_int clock, u_int id);
 void	cpu_reset(void);
 void	cpu_setregs(struct pcpu *pc);
-int	is_physical_memory(vm_offset_t addr);
+int	is_physical_memory(vm_paddr_t addr);
 void	swi_vm(void *v);
 
 cpu_block_copy_t spitfire_block_copy;
diff --git a/sys/sparc64/include/ofw_mem.h b/sys/sparc64/include/ofw_mem.h
index 36e734764a11..ea81e63d0709 100644
--- a/sys/sparc64/include/ofw_mem.h
+++ b/sys/sparc64/include/ofw_mem.h
@@ -30,13 +30,13 @@
 #define	_MACHINE_OFW_MEM_H_
 
 struct ofw_mem_region {
-	vm_offset_t mr_start;
-	vm_offset_t mr_size;
+	vm_paddr_t mr_start;
+	vm_size_t mr_size;
 };
 
 struct ofw_map {
 	vm_offset_t om_start;
-	vm_offset_t om_size;
+	vm_size_t om_size;
 	u_long	om_tte;
 };
 
diff --git a/sys/sparc64/include/pmap.h b/sys/sparc64/include/pmap.h
index 4bfa258dafdb..ab05d7b2236b 100644
--- a/sys/sparc64/include/pmap.h
+++ b/sys/sparc64/include/pmap.h
@@ -72,10 +72,10 @@ struct pmap {
 
 void	pmap_bootstrap(vm_offset_t ekva);
 void	pmap_context_rollover(void);
-vm_offset_t pmap_kextract(vm_offset_t va);
-void	pmap_kenter(vm_offset_t va, vm_offset_t pa);
+vm_paddr_t pmap_kextract(vm_offset_t va);
+void	pmap_kenter(vm_offset_t va, vm_page_t m);
 void	pmap_kremove(vm_offset_t);
-void	pmap_kenter_flags(vm_offset_t va, vm_offset_t pa, u_long flags);
+void	pmap_kenter_flags(vm_offset_t va, vm_paddr_t pa, u_long flags);
 void	pmap_kremove_flags(vm_offset_t va);
 
 int	pmap_cache_enter(vm_page_t m, vm_offset_t va);
@@ -92,15 +92,15 @@ void	pmap_clear_write(vm_page_t m);
 
 #define	vtophys(va)	pmap_kextract(((vm_offset_t)(va)))
 
-extern	vm_offset_t avail_start;
-extern	vm_offset_t avail_end;
+extern	vm_paddr_t avail_start;
+extern	vm_paddr_t avail_end;
 extern	struct pmap kernel_pmap_store;
 #define	kernel_pmap	(&kernel_pmap_store)
-extern	vm_offset_t phys_avail[];
+extern	vm_paddr_t phys_avail[];
 extern	vm_offset_t virtual_avail;
 extern	vm_offset_t virtual_end;
 
-extern	vm_offset_t msgbuf_phys;
+extern	vm_paddr_t msgbuf_phys;
 
 static __inline int
 pmap_track_modified(pmap_t pm, vm_offset_t va)
diff --git a/sys/sparc64/include/smp.h b/sys/sparc64/include/smp.h
index 5dbfc76b5b30..fba9eeaa9b25 100644
--- a/sys/sparc64/include/smp.h
+++ b/sys/sparc64/include/smp.h
@@ -59,7 +59,7 @@ struct cpu_start_args {
 
 struct ipi_cache_args {
 	u_int	ica_mask;
-	u_long	ica_pa;
+	vm_paddr_t ica_pa;
 };
 
 struct ipi_tlb_args {
@@ -110,7 +110,7 @@ extern	char tl_ipi_tlb_range_demap[];
 #if defined(_MACHINE_PMAP_H_) && defined(_SYS_MUTEX_H_)
 
 static __inline void *
-ipi_dcache_page_inval(void *func, vm_offset_t pa)
+ipi_dcache_page_inval(void *func, vm_paddr_t pa)
 {
 	struct ipi_cache_args *ica;
 
@@ -125,7 +125,7 @@ ipi_dcache_page_inval(void *func, vm_offset_t pa)
 }
 
 static __inline void *
-ipi_icache_page_inval(void *func, vm_offset_t pa)
+ipi_icache_page_inval(void *func, vm_paddr_t pa)
 {
 	struct ipi_cache_args *ica;
 
@@ -215,13 +215,13 @@ ipi_wait(void *cookie)
 #else
 
 static __inline void *
-ipi_dcache_page_inval(void *func, vm_offset_t pa)
+ipi_dcache_page_inval(void *func, vm_paddr_t pa)
 {
 	return (NULL);
 }
 
 static __inline void *
-ipi_icache_page_inval(void *func, vm_offset_t pa)
+ipi_icache_page_inval(void *func, vm_paddr_t pa)
 {
 	return (NULL);
 }
diff --git a/sys/sparc64/include/tsb.h b/sys/sparc64/include/tsb.h
index 9a817c20376f..fa1feffc82fa 100644
--- a/sys/sparc64/include/tsb.h
+++ b/sys/sparc64/include/tsb.h
@@ -46,7 +46,7 @@
 extern struct tte *tsb_kernel;
 extern vm_size_t tsb_kernel_mask;
 extern vm_size_t tsb_kernel_size;
-extern vm_offset_t tsb_kernel_phys;
+extern vm_paddr_t tsb_kernel_phys;
 
 static __inline struct tte *
 tsb_vpntobucket(pmap_t pm, vm_offset_t vpn)
diff --git a/sys/sparc64/include/watch.h b/sys/sparc64/include/watch.h
index bd0e2f02720e..bb658f9efb53 100644
--- a/sys/sparc64/include/watch.h
+++ b/sys/sparc64/include/watch.h
@@ -27,9 +27,9 @@
 #ifndef	_MACHINE_WATCH_H_
 #define	_MACHINE_WATCH_H_
 
-int	watch_phys_set_mask(vm_offset_t pa, u_long mask);
-int	watch_phys_set(vm_offset_t pa, int sz);
-vm_offset_t	watch_phys_get(int *bm);
+int	watch_phys_set_mask(vm_paddr_t pa, u_long mask);
+int	watch_phys_set(vm_paddr_t pa, int sz);
+vm_paddr_t	watch_phys_get(int *bm);
 void	watch_phys_clear(void);
 int	watch_phys_active(void);
 int	watch_virt_set_mask(vm_offset_t va, u_long mask);