change *int64*_t types to long long; ok art/jason

3 files changed, 14 insertions, 14 deletions

diff --git a/sys/arch/sparc64/include/int_types.h b/sys/arch/sparc64/include/int_types.h
index 7c409881010..64c538b30ac 100644
--- a/sys/arch/sparc64/include/int_types.h
+++ b/sys/arch/sparc64/include/int_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: int_types.h,v 1.1 2001/08/18 04:16:40 jason Exp $	*/
+/*	$OpenBSD: int_types.h,v 1.2 2001/09/26 17:32:19 deraadt Exp $	*/
 /*	$NetBSD: int_types.h,v 1.7 2001/04/28 15:41:33 kleink Exp $	*/
 
 /*
@@ -71,9 +71,9 @@ typedef	__COMPILER_UINT64__   u_int64_t;
 #else
 #ifdef __arch64__
 /* 64-bit compiler */
-typedef	long int		int64_t;
-typedef	unsigned long int      uint64_t;
-typedef	unsigned long int     u_int64_t;
+typedef	long long int		int64_t;
+typedef	unsigned long long int	uint64_t;
+typedef	unsigned long long int	u_int64_t;
 #else
 /* 32-bit compiler */
 /* LONGLONG */
diff --git a/sys/arch/sparc64/include/sparc64.h b/sys/arch/sparc64/include/sparc64.h
index 1a4d7b4e19e..8d09eebce45 100644
--- a/sys/arch/sparc64/include/sparc64.h
+++ b/sys/arch/sparc64/include/sparc64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sparc64.h,v 1.2 2001/08/20 20:23:52 jason Exp $	*/
+/*	$OpenBSD: sparc64.h,v 1.3 2001/09/26 17:32:19 deraadt Exp $	*/
 /*	$NetBSD: sparc64.h,v 1.3 2000/10/20 05:47:03 mrg Exp $	*/
 
 /*
@@ -40,16 +40,16 @@ struct mem_region {
 };
 
 int prom_set_trap_table __P((vaddr_t tba));
-u_int64_t prom_vtop __P((vaddr_t vaddr));
+paddr_t prom_vtop __P((vaddr_t vaddr));
 vaddr_t prom_claim_virt __P((vaddr_t vaddr, int len));
 vaddr_t prom_alloc_virt __P((int len, int align));
 int prom_free_virt __P((vaddr_t vaddr, int len));
 int prom_unmap_virt __P((vaddr_t vaddr, int len));
-int prom_map_phys __P((u_int64_t paddr, off_t size, vaddr_t vaddr, int mode));
-u_int64_t prom_alloc_phys __P((int len, int align));
-u_int64_t prom_claim_phys __P((paddr_t phys, int len));
+int prom_map_phys __P((paddr_t paddr, off_t size, vaddr_t vaddr, int mode));
+paddr_t prom_alloc_phys __P((int len, int align));
+paddr_t prom_claim_phys __P((paddr_t phys, int len));
 int prom_free_phys __P((paddr_t paddr, int len));
-u_int64_t prom_get_msgbuf __P((int len, int align));
+paddr_t prom_get_msgbuf __P((int len, int align));
 
 /*
  * Compatibility stuff.
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index b143a879efc..c96e53a3729 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.4 2001/09/20 23:23:59 jason Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.5 2001/09/26 17:32:19 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $	*/
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -1278,7 +1278,7 @@ remap_data:
 			pmap_get_page(&newp);
 			pmap_zero_page(newp);
 		} while (!newp); /* Throw away page zero */
-		pmap_kernel()->pm_segs=(paddr_t *)(u_long)newp;
+		pmap_kernel()->pm_segs=(int64_t *)(u_long)newp;
 		pmap_kernel()->pm_physaddr = newp;
 		/* mark kernel context as busy */
 		((paddr_t*)ctxbusy)[0] = (int)pmap_kernel()->pm_physaddr;
@@ -1661,7 +1661,7 @@ pmap_pinit(pm)
 		}
 		pm->pm_physaddr = (paddr_t)VM_PAGE_TO_PHYS(page);
 		pmap_zero_page(pm->pm_physaddr);
-		pm->pm_segs = (paddr_t *)(u_long)pm->pm_physaddr;
+		pm->pm_segs = (int64_t *)(u_long)pm->pm_physaddr;
 		if (!pm->pm_physaddr) panic("pmap_pinit");
 #ifdef NOTDEF_DEBUG
 		printf("pmap_pinit: segs %p == %p\n", pm->pm_segs, (void*)page->phys_addr);
@@ -2159,7 +2159,7 @@ int
 pmap_enter(pm, va, pa, prot, flags)
 	struct pmap *pm;
 	vaddr_t va;
-	u_int64_t pa;
+	paddr_t pa;
 	vm_prot_t prot;
 	int flags;
 {