Module Name: src
Committed By: matt
Date: Sat Sep 13 18:08:40 UTC 2014
Modified Files:
src/sys/arch/acorn26/acorn26: db_interface.c
src/sys/arch/acorn26/include: vmparam.h
src/sys/arch/acorn32/podulebus: esc.c podulebus.c ptsc.c sfas.c
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/arm/footbridge/isa: isa_io.c
src/sys/arch/arm/include: db_machdep.h
src/sys/arch/arm/iomd: vidcaudio.c
src/sys/arch/epoc32/epoc32: machdep.c
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/tsarm/isa: isa_io.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
Log Message:
Replace more vm_offset_t, vm_size_t with vaddr_t, vsize_t
Use paddr_t for msgbufphys
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn26/acorn26/db_interface.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/acorn26/include/vmparam.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/podulebus/esc.c \
src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/acorn32/podulebus/ptsc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/acorn32/podulebus/sfas.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/footbridge/isa/isa_io.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/db_machdep.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/iomd/vidcaudio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/epoc32/machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/tsarm/isa/isa_io.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.82 -r1.83 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/db_interface.c
diff -u src/sys/arch/acorn26/acorn26/db_interface.c:1.20 src/sys/arch/acorn26/acorn26/db_interface.c:1.21
--- src/sys/arch/acorn26/acorn26/db_interface.c:1.20 Sat Mar 8 16:55:38 2014
+++ src/sys/arch/acorn26/acorn26/db_interface.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.21 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.21 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
@@ -167,7 +167,7 @@ kdb_trap(int type, db_regs_t *regs)
volatile bool db_validating, db_faulted;
int
-db_validate_address(vm_offset_t addr)
+db_validate_address(vaddr_t addr)
{
db_faulted = false;
@@ -181,7 +181,7 @@ db_validate_address(vm_offset_t addr)
* Read bytes from kernel address space for debugger.
*/
void
-db_read_bytes(vm_offset_t addr, size_t size, char *data)
+db_read_bytes(vaddr_t addr, size_t size, char *data)
{
char *src;
@@ -211,7 +211,7 @@ db_write_text(unsigned char *dst, int ch
* Write bytes to kernel address space for debugger.
*/
void
-db_write_bytes(vm_offset_t addr, size_t size, const char *data)
+db_write_bytes(vaddr_t addr, size_t size, const char *data)
{
#if 0
extern char _stext_[], _etext[];
Index: src/sys/arch/acorn26/include/vmparam.h
diff -u src/sys/arch/acorn26/include/vmparam.h:1.12 src/sys/arch/acorn26/include/vmparam.h:1.13
--- src/sys/arch/acorn26/include/vmparam.h:1.12 Fri Aug 26 09:26:14 2011
+++ src/sys/arch/acorn26/include/vmparam.h Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.12 2011/08/26 09:26:14 reinoud Exp $ */
+/* $NetBSD: vmparam.h,v 1.13 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -79,13 +79,13 @@
#define KVM_SIZE 0x00800000 /* 8Mb */
/* User VM range */
-#define VM_MIN_ADDRESS ((vm_offset_t)0x00008000)
-#define VM_MAX_ADDRESS ((vm_offset_t)0x02000000 - KVM_SIZE)
+#define VM_MIN_ADDRESS ((vaddr_t)0x00008000)
+#define VM_MAX_ADDRESS ((vaddr_t)0x02000000 - KVM_SIZE)
#define VM_MAXUSER_ADDRESS VM_MAX_ADDRESS
/* Kernel VM range */
#define VM_MIN_KERNEL_ADDRESS VM_MAX_ADDRESS
-#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0x02000000)
+#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0x02000000)
#define VM_MAXKERN_ADDRESS VM_MAX_KERNEL_ADDRESS
/* XXX max. amount of KVM to be used by buffers. */
Index: src/sys/arch/acorn32/podulebus/esc.c
diff -u src/sys/arch/acorn32/podulebus/esc.c:1.27 src/sys/arch/acorn32/podulebus/esc.c:1.28
--- src/sys/arch/acorn32/podulebus/esc.c:1.27 Sat Feb 22 19:03:06 2014
+++ src/sys/arch/acorn32/podulebus/esc.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $ */
+/* $NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.27 2014/02/22 19:03:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -254,7 +254,7 @@ escinitialize(struct esc_softc *dev)
l2pte_set(ptep, npte, opte);
PTE_SYNC(ptep);
cpu_tlb_flushD();
- cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE);
+ cpu_dcache_wbinv_range((vaddr_t)dev->sc_bump_va, PAGE_SIZE);
printf(" dmabuf V0x%08x P0x%08x", (u_int)dev->sc_bump_va, (u_int)dev->sc_bump_pa);
}
@@ -892,7 +892,7 @@ esc_setup_nexus(struct esc_softc *dev, s
/* Flush the caches. */
if (len && !(mode & ESC_SELECT_I))
- cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_dcache_wbinv_range((vaddr_t)buf, len);
}
int
Index: src/sys/arch/acorn32/podulebus/podulebus.c
diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.27 src/sys/arch/acorn32/podulebus/podulebus.c:1.28
--- src/sys/arch/acorn32/podulebus/podulebus.c:1.27 Fri Mar 21 16:43:00 2014
+++ src/sys/arch/acorn32/podulebus/podulebus.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $ */
+/* $NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.27 2014/03/21 16:43:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -429,7 +429,7 @@ podulebusattach(device_t parent, device_
* are built during initarm
*/
/* Map the FAST and SYNC simple podules */
- pmap_map_section((vm_offset_t)pmap_kernel()->pm_pdir,
+ pmap_map_section((vaddr_t)pmap_kernel()->pm_pdir,
SYNC_PODULE_BASE & 0xfff00000, SYNC_PODULE_HW_BASE & 0xfff00000,
VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
cpu_tlb_flushD();
@@ -440,7 +440,7 @@ podulebusattach(device_t parent, device_
for (loop1 = loop * EASI_SIZE; loop1 < ((loop + 1) * EASI_SIZE);
loop1 += L1_S_SIZE)
- pmap_map_section((vm_offset_t)pmap_kernel()->pm_pdir,
+ pmap_map_section((vaddr_t)pmap_kernel()->pm_pdir,
EASI_BASE + loop1, EASI_HW_BASE + loop1,
VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE);
}
Index: src/sys/arch/acorn32/podulebus/ptsc.c
diff -u src/sys/arch/acorn32/podulebus/ptsc.c:1.18 src/sys/arch/acorn32/podulebus/ptsc.c:1.19
--- src/sys/arch/acorn32/podulebus/ptsc.c:1.18 Sat Oct 27 17:17:23 2012
+++ src/sys/arch/acorn32/podulebus/ptsc.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptsc.c,v 1.18 2012/10/27 17:17:23 chs Exp $ */
+/* $NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.18 2012/10/27 17:17:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.19 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -385,7 +385,7 @@ int
ptsc_build_dma_chain(void *v1, void *v2, void *p, int l)
{
#if 0
- vm_offset_t pa, lastpa;
+ vaddr_t pa, lastpa;
char *ptr;
int len, prelen, postlen, max_t, n;
#endif
@@ -404,12 +404,12 @@ do { chain[n].ptr = (p); chain[n].len =
n = 0;
if (l < 512)
- set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)p, l, SFAS_CHAIN_BUMP);
else if (p >= (void *)0xFF000000) {
while(l != 0) {
len = ((l > sc->sc_bump_sz) ? sc->sc_bump_sz : l);
- set_link(n, (vm_offset_t)p, len, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)p, len, SFAS_CHAIN_BUMP);
p += len;
l -= len;
@@ -423,7 +423,7 @@ do { chain[n].ptr = (p); chain[n].len =
if (prelen) {
prelen = 4-prelen;
- set_link(n, (vm_offset_t)ptr, prelen, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)ptr, prelen, SFAS_CHAIN_BUMP);
ptr += prelen;
len -= prelen;
}
@@ -449,7 +449,7 @@ do { chain[n].ptr = (p); chain[n].len =
}
if (len)
- set_link(n, (vm_offset_t)ptr, len, SFAS_CHAIN_BUMP);
+ set_link(n, (vaddr_t)ptr, len, SFAS_CHAIN_BUMP);
}
return(n);
Index: src/sys/arch/acorn32/podulebus/sfas.c
diff -u src/sys/arch/acorn32/podulebus/sfas.c:1.24 src/sys/arch/acorn32/podulebus/sfas.c:1.25
--- src/sys/arch/acorn32/podulebus/sfas.c:1.24 Sat Feb 22 19:03:06 2014
+++ src/sys/arch/acorn32/podulebus/sfas.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $ */
+/* $NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.24 2014/02/22 19:03:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.25 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,7 +250,7 @@ sfasinitialize(struct sfas_softc *dev)
l2pte_set(ptep, npte, opte);
PTE_SYNC(ptep);
cpu_tlb_flushD();
- cpu_dcache_wbinv_range((vm_offset_t)dev->sc_bump_va, PAGE_SIZE);
+ cpu_dcache_wbinv_range((vaddr_t)dev->sc_bump_va, PAGE_SIZE);
printf(" dmabuf V0x%08x P0x%08x", (u_int)dev->sc_bump_va, (u_int)dev->sc_bump_pa);
}
@@ -813,7 +813,7 @@ sfas_setup_nexus(struct sfas_softc *dev,
/* Flush the caches. */
if (len && !(mode & SFAS_SELECT_I))
- cpu_dcache_wbinv_range((vm_offset_t)buf, len);
+ cpu_dcache_wbinv_range((vaddr_t)buf, len);
}
int
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.17 src/sys/arch/arm/at91/at91bus.c:1.18
--- src/sys/arch/arm/at91/at91bus.c:1.17 Sun Aug 18 15:58:19 2013
+++ src/sys/arch/arm/at91/at91bus.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.17 2013/08/18 15:58:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -98,14 +98,14 @@ int cnmode = CONMODE;
/* boot configuration: */
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_freeend_low;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_freeend_low;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
//static struct arm32_dma_range dma_ranges[4];
Index: src/sys/arch/arm/footbridge/isa/isa_io.c
diff -u src/sys/arch/arm/footbridge/isa/isa_io.c:1.7 src/sys/arch/arm/footbridge/isa/isa_io.c:1.8
--- src/sys/arch/arm/footbridge/isa/isa_io.c:1.7 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/arm/footbridge/isa/isa_io.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.7 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: isa_io.c,v 1.8 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.7 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.8 2014/09/13 18:08:38 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,7 +222,7 @@ struct bus_space isa_mem_bs_tag = {
/* bus space functions */
void
-isa_io_init(vm_offset_t isa_io_addr, vm_offset_t isa_mem_addr)
+isa_io_init(vaddr_t isa_io_addr, vaddr_t isa_mem_addr)
{
isa_io_bs_tag.bs_cookie = (void *)isa_io_addr;
isa_mem_bs_tag.bs_cookie = (void *)isa_mem_addr;
@@ -233,16 +233,16 @@ isa_io_init(vm_offset_t isa_io_addr, vm_
* (e.g. X servers) need to map ISA space directly. use these
* functions sparingly!
*/
-vm_offset_t
+vaddr_t
isa_io_data_vaddr(void)
{
- return (vm_offset_t)isa_io_bs_tag.bs_cookie;
+ return (vaddr_t)isa_io_bs_tag.bs_cookie;
}
-vm_offset_t
+vaddr_t
isa_mem_data_vaddr(void)
{
- return (vm_offset_t)isa_mem_bs_tag.bs_cookie;
+ return (vaddr_t)isa_mem_bs_tag.bs_cookie;
}
int
Index: src/sys/arch/arm/include/db_machdep.h
diff -u src/sys/arch/arm/include/db_machdep.h:1.21 src/sys/arch/arm/include/db_machdep.h:1.22
--- src/sys/arch/arm/include/db_machdep.h:1.21 Sun Mar 30 08:00:34 2014
+++ src/sys/arch/arm/include/db_machdep.h Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.21 2014/03/30 08:00:34 skrll Exp $ */
+/* $NetBSD: db_machdep.h,v 1.22 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -118,7 +118,7 @@ extern db_regs_t *ddb_regp;
u_int branch_taken(u_int insn, u_int pc, db_regs_t *db_regs);
int kdb_trap(int, db_regs_t *);
void db_machine_init(void);
-int db_validate_address(vm_offset_t addr);
+int db_validate_address(vaddr_t addr);
#define DB_ELF_SYMBOLS
#define DB_ELFSIZE 32
Index: src/sys/arch/arm/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.51 src/sys/arch/arm/iomd/vidcaudio.c:1.52
--- src/sys/arch/arm/iomd/vidcaudio.c:1.51 Wed Oct 10 22:00:22 2012
+++ src/sys/arch/arm/iomd/vidcaudio.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcaudio.c,v 1.51 2012/10/10 22:00:22 skrll Exp $ */
+/* $NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,7 +65,7 @@
#include <sys/param.h> /* proc.h */
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.51 2012/10/10 22:00:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.52 2014/09/13 18:08:38 matt Exp $");
#include <sys/audioio.h>
#include <sys/conf.h> /* autoconfig functions */
@@ -114,8 +114,8 @@ struct vidcaudio_softc {
int sc_is16bit;
size_t sc_pblksize;
- vm_offset_t sc_poffset;
- vm_offset_t sc_pbufsize;
+ vaddr_t sc_poffset;
+ vaddr_t sc_pbufsize;
paddr_t *sc_ppages;
void (*sc_pintr)(void *);
void *sc_parg;
Index: src/sys/arch/epoc32/epoc32/machdep.c
diff -u src/sys/arch/epoc32/epoc32/machdep.c:1.3 src/sys/arch/epoc32/epoc32/machdep.c:1.4
--- src/sys/arch/epoc32/epoc32/machdep.c:1.3 Sun Aug 18 21:57:01 2013
+++ src/sys/arch/epoc32/epoc32/machdep.c Sat Sep 13 18:08:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.4 2014/09/13 18:08:40 matt Exp $ */
/*
* Copyright (c) 2012, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2013/08/18 21:57:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2014/09/13 18:08:40 matt Exp $");
#include "clpscom.h"
#include "clpslcd.h"
@@ -87,13 +87,13 @@ BootConfig bootconfig; /* Boot config s
static char bootargs[256];
char *boot_args = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
enum {
KERNEL_PT_SYS = 0, /* Page table for mapping proc0 zero page */
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.42 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.43
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.42 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.42 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.43 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.42 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.43 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -133,10 +133,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -147,7 +147,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.27 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.28
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.27 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.27 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.27 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -204,14 +204,14 @@ BootConfig bootconfig; /* Boot config st
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_freeend_low;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_freeend_low;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
static struct arm32_dma_range armadillo9_dma_ranges[4];
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.28 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.29
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.28 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Sat Sep 13 18:08:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.28 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.29 2014/09/13 18:08:38 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -166,10 +166,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -180,7 +180,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.21 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.22
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.21 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.21 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.22 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.21 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.22 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -131,10 +131,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -144,7 +144,7 @@ int max_processes = 64; /* Default num
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.17 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.18
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.17 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.17 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.18 2014/09/13 18:08:39 matt Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.17 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.18 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -171,10 +171,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -182,7 +182,7 @@ u_int free_pages;
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.84 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.85
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.84 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.84 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.85 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.84 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.85 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -130,10 +130,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -143,7 +143,7 @@ int max_processes = 64; /* Default num
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.54 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.55
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.54 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.55 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.55 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -132,10 +132,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -146,7 +146,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.34 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.35
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.34 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.34 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.34 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -125,16 +125,16 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
extern int end;
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.55 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.56
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.55 Sat Feb 22 19:03:57 2014
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.56 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.56 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -150,10 +150,10 @@ BootConfig bootconfig; /* Boot
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -161,7 +161,7 @@ u_int free_pages;
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
extern int end;
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.32 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.33
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.32 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.32 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.33 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.32 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.33 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -175,10 +175,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -189,7 +189,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.8 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.9
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.8 Fri Mar 14 21:39:48 2014
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Sat Sep 13 18:08:39 2014
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.8 2014/03/14 21:39:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.9 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -219,20 +219,20 @@ struct btinfo_rootdevice *bi_rdev;
struct btinfo_net *bi_net;
struct btinfo_bootpath *bi_path;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_freeend_low;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_freeend_low;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t pagetables_start;
+vaddr_t pagetables_start;
/*int debug_flags;*/
#ifndef PMAP_STATIC_L1S
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.19 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.20
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.19 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.19 2012/09/22 00:33:40 matt Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.20 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.19 2012/09/22 00:33:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.20 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -131,10 +131,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -145,7 +145,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.24 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.25
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.24 Mon Aug 19 22:26:09 2013
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.25 2014/09/13 18:08:39 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.25 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -155,16 +155,16 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
extern int end;
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.34 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.35
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.34 Thu Feb 27 22:57:22 2014
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.34 2014/02/27 22:57:22 joerg Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.34 2014/02/27 22:57:22 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -186,10 +186,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -197,7 +197,7 @@ u_int free_pages;
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
@@ -419,7 +419,7 @@ initarm(void *arg)
int progress_counter = 0;
#ifdef DO_MEMORY_DISK
- vm_offset_t md_root_start;
+ vaddr_t md_root_start;
#define MD_ROOT_SIZE (MEMORY_DISK_ROOT_SIZE * DEV_BSIZE)
#endif
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.41 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.42
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.41 Sun Aug 18 15:58:21 2013
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.41 2013/08/18 15:58:21 matt Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.42 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.41 2013/08/18 15:58:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.42 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -177,10 +177,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -188,7 +188,7 @@ u_int free_pages;
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
@@ -353,7 +353,7 @@ initarm(void *arg)
int progress_counter = 0;
#ifdef DO_MEMORY_DISK
- vm_offset_t md_root_start;
+ vaddr_t md_root_start;
#define MD_ROOT_SIZE (MEMORY_DISK_ROOT_SIZE * DEV_BSIZE)
#endif
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.22 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.23
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.22 Sat Mar 8 18:07:39 2014
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.22 2014/03/08 18:07:39 skrll Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.23 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.22 2014/03/08 18:07:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.23 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -148,14 +148,14 @@ struct bootconfig bootconfig; /* Boot c
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_freeend_low;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_freeend_low;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
static struct arm32_dma_range tsarm_dma_ranges[4];
Index: src/sys/arch/evbarm/tsarm/isa/isa_io.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.10 src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.11
--- src/sys/arch/evbarm/tsarm/isa/isa_io.c:1.10 Sun Feb 12 16:34:08 2012
+++ src/sys/arch/evbarm/tsarm/isa/isa_io.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.10 2012/02/12 16:34:08 matt Exp $ */
+/* $NetBSD: isa_io.c,v 1.11 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.10 2012/02/12 16:34:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.11 2014/09/13 18:08:39 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,7 @@ isa_bs_mallocok(void)
/* bus space functions */
void
-isa_io_init(vm_offset_t isa_io_addr, vm_offset_t isa_mem_addr)
+isa_io_init(vaddr_t isa_io_addr, vaddr_t isa_mem_addr)
{
isa_io_bs_tag.bs_cookie = (void *)isa_io_addr;
isa_mem_bs_tag.bs_cookie = (void *)isa_mem_addr;
@@ -257,16 +257,16 @@ isa_io_init(vm_offset_t isa_io_addr, vm_
* (e.g. X servers) need to map ISA space directly. use these
* functions sparingly!
*/
-vm_offset_t
+vaddr_t
isa_io_data_vaddr(void)
{
- return (vm_offset_t)isa_io_bs_tag.bs_cookie;
+ return (vaddr_t)isa_io_bs_tag.bs_cookie;
}
-vm_offset_t
+vaddr_t
isa_mem_data_vaddr(void)
{
- return (vm_offset_t)isa_mem_bs_tag.bs_cookie;
+ return (vaddr_t)isa_mem_bs_tag.bs_cookie;
}
int
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.23 src/sys/arch/evbarm/viper/viper_machdep.c:1.24
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.23 Sun Aug 18 15:58:21 2013
+++ src/sys/arch/evbarm/viper/viper_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.23 2013/08/18 15:58:21 matt Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.23 2013/08/18 15:58:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -174,10 +174,10 @@ BootConfig bootconfig; /* Boot config s
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
/*int debug_flags;*/
@@ -188,7 +188,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.23 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.24
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.23 Sun Mar 2 13:28:23 2014
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.23 2014/03/02 13:28:23 joerg Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.23 2014/03/02 13:28:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -133,12 +133,12 @@ struct bootconfig bootconfig; /* Boot c
char *boot_args;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t pagetables_start;
+vaddr_t pagetables_start;
/*int debug_flags;*/
#ifndef PMAP_STATIC_L1S
@@ -148,7 +148,7 @@ int max_processes = 64; /* Default num
/* Physical and virtual addresses for some global pages */
pv_addr_t minidataclean;
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.82 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.83
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.82 Sat Sep 13 17:42:07 2014
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Sat Sep 13 18:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.82 2014/09/13 17:42:07 matt Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.83 2014/09/13 18:08:39 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.82 2014/09/13 17:42:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.83 2014/09/13 18:08:39 matt Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -122,19 +122,19 @@ static char bootargs[MAX_BOOT_STRING + 1
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
+vaddr_t physical_start;
+vaddr_t physical_freestart;
+vaddr_t physical_freeend;
+vaddr_t physical_end;
u_int free_pages;
-vm_offset_t pagetables_start;
+vaddr_t pagetables_start;
/*int debug_flags;*/
#ifndef PMAP_STATIC_L1S
int max_processes = 64; /* Default number */
#endif /* !PMAP_STATIC_L1S */
-vm_offset_t msgbufphys;
+paddr_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
