spacing

22 files changed, 99 insertions, 100 deletions

diff --git a/sys/arch/mips64/mips64/arcbios.c b/sys/arch/mips64/mips64/arcbios.c
index d9291a0f0ee..33830683cb1 100644
--- a/sys/arch/mips64/mips64/arcbios.c
+++ b/sys/arch/mips64/mips64/arcbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcbios.c,v 1.2 2004/08/09 14:57:26 pefo Exp $	*/
+/*	$OpenBSD: arcbios.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $	*/
 /*-
  * Copyright (c) 1996 M. Warner Losh.  All rights reserved.
  * Copyright (c) 1996-2004 Opsycon AB.  All rights reserved.
@@ -55,7 +55,7 @@ static struct systypes {
 } sys_types[] = {
     { NULL,		"PICA-61",			ACER_PICA_61 },
     { NULL,		"NEC-R94",			ACER_PICA_61 },
-    { NULL,		"DESKTECH-TYNE",		DESKSTATION_TYNE }, 
+    { NULL,		"DESKTECH-TYNE",		DESKSTATION_TYNE },
     { NULL,		"DESKTECH-ARCStation I",	DESKSTATION_RPC44 },
     { NULL,		"Microsoft-Jazz",		MAGNUM },
     { NULL,		"RM200PCI",			SNI_RM200 },
@@ -80,7 +80,7 @@ __asm__("\n"			\
 "	.ent	" #Name "\n"	\
 "	.align	3\n"		\
 "	.set	noreorder\n"	\
-"	.globl	" #Name "\n" 	\
+"	.globl	" #Name "\n"	\
 #Name":\n"			\
 "	lw	$2, 0x80001020\n"\
 "	lw	$2," #Offset "($2)\n"\
diff --git a/sys/arch/mips64/mips64/busdma.c b/sys/arch/mips64/mips64/busdma.c
index 02c4396794c..659b3da0a25 100644
--- a/sys/arch/mips64/mips64/busdma.c
+++ b/sys/arch/mips64/mips64/busdma.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: busdma.c,v 1.3 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: busdma.c,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -357,7 +357,7 @@ _dmamap_sync(t, map, addr, size, op)
 	while (size && nsegs) {
 		bus_addr_t vaddr;
 		bus_size_t ssize;
-		
+
 		ssize = map->dm_segs[curseg].ds_len;
 		vaddr = map->dm_segs[curseg].ds_vaddr;
 
diff --git a/sys/arch/mips64/mips64/cache_r5k.S b/sys/arch/mips64/mips64/cache_r5k.S
index 334b5859550..5398bb309d0 100644
--- a/sys/arch/mips64/mips64/cache_r5k.S
+++ b/sys/arch/mips64/mips64/cache_r5k.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: cache_r5k.S,v 1.3 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: cache_r5k.S,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998-2004 Opsycon AB (www.opsycon.se)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -179,7 +179,7 @@ LEAF(Mips5k_ConfigCache)
 	and	t2, v0, 0x20
 	srl	t2, t2, 1			# Get I cache line size.
 	addu	t2, t2, 16
-	sw	t2, CpuPrimaryInstCacheLSize	
+	sw	t2, CpuPrimaryInstCacheLSize
 
 	srl	t1, v0, 6			# Get D cache size.
 	and	t1, 3
@@ -196,8 +196,8 @@ LEAF(Mips5k_ConfigCache)
 
 	and	v1, 0xff00			# Recognize CPU's with
 	li	t1, (MIPS_R4600 << 8)		# N way L1 caches only.
-	beq	v1, t1, ConfResult		# R4K 2 way, no L2 control	
-	li	t1, (MIPS_R4700 << 8)	
+	beq	v1, t1, ConfResult		# R4K 2 way, no L2 control
+	li	t1, (MIPS_R4700 << 8)
 	beq	v1, t1, ConfResult		# R4K 2 way, No L2 control
 	li	t1, (MIPS_R5000 << 8)
 	beq	v1, t1, Conf5K			# R5K 2 way, check L2
@@ -266,7 +266,7 @@ Conf52K:					# R5200 type, check for L2 cache
 	li	t1, ~CF_52_SE			# Clear SE in conf
 	and	v0, t1				# Update config register
 	b	ConfResult
-	li	t6, 0				# L2 cache disabled 
+	li	t6, 0				# L2 cache disabled
 
 
 #---- RM7K -----------------------------
@@ -289,7 +289,7 @@ Conf7K:					# RM7000, check for L2 and L3 cache
 	and	v0, ~CF_7_TE			# Clear TE in conf
 	mtc0	v0, COP_0_CONFIG		# establish any new config
 	NOP10
-	li	t7, 0				# L3 cache disabled 
+	li	t7, 0				# L3 cache disabled
 
 Conf7KL2:
 	and	t1, v0, CF_7_SC			# check for L2 cache
@@ -303,7 +303,7 @@ Conf7KL2:
 
 /* Sync on chip L2 */
 
-	li	a0, 0x80000000 
+	li	a0, 0x80000000
 	li	a1, 0x80040000
 10:
 	cache	IndexWBInvalidate_S, 0(a0)
@@ -591,7 +591,7 @@ END(Mips5k_InvalidateICache)
  *
  *	Sync the L1 data cache page for address addr.
  *	The address is reduced to a KSEG0 index to avoid TLB faults.
- *	
+ *
  * Results:
  *	None.
  *
@@ -667,7 +667,7 @@ END(Mips5k_SyncDCachePage)
  *
  *	Note: Use the CpuNWayCache flag to select 16 or 32 byte linesize.
  *	      All Nway cpu's now available have a fixed 32byte linesize.
- *	
+ *
  * Results:
  *	None.
  *
@@ -877,7 +877,7 @@ END(Mips5k_HitInvalidateSCache)
  *	(Be sure to use cached K0SEG kernel addresses or mapped addresses)
  *
  *	In case of the existence of an external cache we invalidate pages
- *	which are in the given range ONLY if transfer direction is READ. 
+ *	which are in the given range ONLY if transfer direction is READ.
  *	The assumption here is a 'write through' external cache which is
  *	true for all now supported processors.
  *
@@ -916,7 +916,7 @@ NON_LEAF(Mips5k_IOSyncDCache, FRAMESZ(CF_SZ), ra)
 
 	b	Mips5k_HitSyncSCache		# Do internal L2 cache
 	nop					# L1 done in parallel
-	
+
 SyncRD:
 	and	t0, a0, 31			# check if invalidate possible
 	bnez	t0, SyncRDWB			# both address and size must
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c
index 7000d4b842a..d588d5ce174 100644
--- a/sys/arch/mips64/mips64/clock.c
+++ b/sys/arch/mips64/mips64/clock.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: clock.c,v 1.4 2004/08/10 13:45:40 pefo Exp $ */
+/*	$OpenBSD: clock.c,v 1.5 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -184,7 +184,7 @@ clock_int5( intrmask_t mask, struct trap_frame *tf)
 }
 
 /*
- * Wait "n" microseconds. 
+ * Wait "n" microseconds.
  */
 void
 delay(int n)
@@ -318,7 +318,7 @@ inittodr(time_t base)
 	 * Read RTC chip registers NOTE: Read routines are responsible
 	 * for sanity checking clock. Dates after 19991231 should be
 	 * returned as year >= 100.
-	 */ 
+	 */
 	if (sc->sc_clock.clk_get) {
 		(*sc->sc_clock.clk_get)(sc, base, &c);
 	} else {
diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S
index fdb0b4b7a18..b963db46861 100644
--- a/sys/arch/mips64/mips64/context.S
+++ b/sys/arch/mips64/mips64/context.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: context.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: context.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/cp0access.S b/sys/arch/mips64/mips64/cp0access.S
index d789cf1a9e3..6f6633ec137 100644
--- a/sys/arch/mips64/mips64/cp0access.S
+++ b/sys/arch/mips64/mips64/cp0access.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: cp0access.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: cp0access.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c
index 384a11ea9d7..0382ce2e611 100644
--- a/sys/arch/mips64/mips64/cpu.c
+++ b/sys/arch/mips64/mips64/cpu.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: cpu.c,v 1.3 2004/08/09 21:00:54 pefo Exp $ */
+/*	$OpenBSD: cpu.c,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -109,10 +109,9 @@ cpuattach(parent, dev, aux)
 	case MIPS_RM7000:
 		if(sys_config.cpu[cpuno].vers_maj < 2) {
 			printf("PMC-Sierra RM7000 CPU");
-		}	
-		else {
+		} else {
 			printf("PMC-Sierra RM7000A CPU");
-		}	
+		}
 		cpu_is_rm7k++;
 		break;
 	case MIPS_RM9000:
@@ -179,7 +178,7 @@ cpuattach(parent, dev, aux)
 	case 4:
 		printf("4 way");
 		break;
-	default:	
+	default:
 		printf("1 way");
 		break;
 	}
diff --git a/sys/arch/mips64/mips64/db_disasm.c b/sys/arch/mips64/mips64/db_disasm.c
index 03558f198ce..108ed73330f 100644
--- a/sys/arch/mips64/mips64/db_disasm.c
+++ b/sys/arch/mips64/mips64/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.1 2004/08/06 20:56:03 pefo Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)kadb.c	8.1 (Berkeley) 6/10/93
- *      $Id: db_disasm.c,v 1.1 2004/08/06 20:56:03 pefo Exp $
+ *      $Id: db_disasm.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $
  */
 
 #include <sys/param.h>
@@ -128,16 +128,15 @@ db_addr_t
 db_disasm(loc, altfmt)
 	db_addr_t loc;
 	boolean_t altfmt;
-
 {
         if (md_printins(kdbpeek((void *)loc), loc)) {
 		loc += 4;
 		printf("\t\t");
-        	md_printins(kdbpeek((void *)loc), loc);
+		md_printins(kdbpeek((void *)loc), loc);
 	}
 	loc += 4;
         return loc;
-} 
+}
 
 /* ARGSUSED */
 static int
@@ -397,7 +396,7 @@ md_printins(int ins, int mdbdot)
 	case OP_ADDIU:
 	case OP_DADDIU:
 		if (i.IType.rs == 0) {
- 			db_printf("li\t%s,%d",
+			db_printf("li\t%s,%d",
 				reg_name[i.IType.rt],
 				(short)i.IType.imm);
 			break;
diff --git a/sys/arch/mips64/mips64/db_machdep.c b/sys/arch/mips64/mips64/db_machdep.c
index 335ed736796..13ff6196f5d 100644
--- a/sys/arch/mips64/mips64/db_machdep.c
+++ b/sys/arch/mips64/mips64/db_machdep.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: db_machdep.c,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: db_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -118,7 +118,7 @@ kdb_trap(type, fp)
 	switch(type) {
 	case T_BREAK:		/* breakpoint */
 		if(db_get_value((fp)->pc, sizeof(int), FALSE) == BREAK_SOVER) {
-                	(fp)->pc += BKPT_SIZE;        
+			(fp)->pc += BKPT_SIZE;
 		}
 		break;
 	case -1:
@@ -306,7 +306,7 @@ loop:
 	more = 3;
 	mask = 0;
 	for (va = subr; more; va += sizeof(int),
-	     		      more = (more == 3) ? 3 : more - 1) {
+	    more = (more == 3) ? 3 : more - 1) {
 		/* stop if hit our current position */
 		if (va >= pc)
 			break;
@@ -382,7 +382,7 @@ loop:
 		case OP_ADDI:
 		case OP_ADDIU:
 		case OP_DADDI:
-		case OP_DADDIU: 
+		case OP_DADDIU:
 			/* look for stack pointer adjustment */
 			if (i.IType.rs != 29 || i.IType.rt != 29)
 				break;
@@ -529,7 +529,7 @@ db_inst_type(ins)
 	case OP_SB:
 	case OP_SH:
 	case OP_SW:
-	case OP_SD:  
+	case OP_SD:
 	case OP_SWC1:
 		ityp = IT_STORE;
 		break;
@@ -637,7 +637,7 @@ if ((tlbp.tlb_hi == tlb.tlb_hi && (tlb.tlb_lo0 & PG_V || tlb.tlb_lo1 & PG_V)) ||
 struct db_command mips_db_command_table[] = {
 	{ "tlb",	db_dump_tlb_cmd,	0,	NULL },
 	{ "trap",	db_trap_trace_cmd,	0,	NULL },
-	{ NULL, 	NULL,			0,	NULL }
+	{ NULL,		NULL,			0,	NULL }
 };
 
 void
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 88aaf6b2551..a9af7d2f7ef 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.1 2004/08/06 20:56:03 pefo Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -137,7 +137,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 			bp->b_flags = B_BUSY | B_READ;
 			bp->b_cylin = part_blkno / lp->d_secpercyl;
 			(*strat)(bp);
-		     
+
 			/* if successful, wander through dos partition table */
 			if (biowait(bp)) {
 				msg = "dos partition I/O error";
diff --git a/sys/arch/mips64/mips64/exception.S b/sys/arch/mips64/mips64/exception.S
index cd61b7ac8de..e07663234bd 100644
--- a/sys/arch/mips64/mips64/exception.S
+++ b/sys/arch/mips64/mips64/exception.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: exception.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: exception.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2002-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -163,7 +163,7 @@ exception:
 	and	k1, k1, CR_EXC_CODE
 
 	LA	k0, u_exception_table
-	PTR_ADDU k0, k0, k1	
+	PTR_ADDU k0, k0, k1
 #if (_MIPS_SZPTR == 64)
 	PTR_ADDU k0, k0, k1		# yes, twice...
 #endif
@@ -173,7 +173,7 @@ exception:
 
 k_exception:
 	LA	k0, k_exception_table
-	PTR_ADDU k0, k0, k1	
+	PTR_ADDU k0, k0, k1
 #if (_MIPS_SZPTR == 64)
 	PTR_ADDU k0, k0, k1		# yes, twice...
 #endif
@@ -246,7 +246,7 @@ NNON_LEAF(u_intr, FRAMESZ(CF_SZ), ra)
 	SAVE_REG(v1, IC, k0, 0)
 #endif
 	PTR_ADDU sp, k0, USPACE-FRAMESZ(CF_SZ)
-	LA	gp, _gp	
+	LA	gp, _gp
 	.set	at
 	and	t0, a1, ~(SR_COP_1_BIT | SR_EXL | SR_INT_ENAB | SR_KSU_MASK)
 	mtc0	t0, COP_0_STATUS_REG
@@ -256,7 +256,7 @@ NNON_LEAF(u_intr, FRAMESZ(CF_SZ), ra)
 	PTR_S	a3, CF_RA_OFFS(sp)		# for debugging
 
 	lw	v0, astpending		# any pending interrupts?
-	beq	v0, zero, 4f	
+	beq	v0, zero, 4f
 	nop
 
 	PTR_L	t0, curprocpaddr
@@ -416,7 +416,7 @@ NNON_LEAF(u_general, FRAMESZ(CF_SZ), ra)
 #endif
 	SAVE_CPU_SREG(k0, 0)
 	PTR_ADDU sp, k0, USPACE-FRAMESZ(CF_SZ)
-	LA	gp, _gp	
+	LA	gp, _gp
 	.set	at
 	and	t0, a1, ~(SR_COP_1_BIT | SR_EXL | SR_INT_ENAB | SR_KSU_MASK)
 	mtc0	t0, COP_0_STATUS_REG
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index 53874d132d7..60da5dcb999 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: interrupt.c,v 1.3 2004/08/10 08:07:35 mickey Exp $ */
+/*	$OpenBSD: interrupt.c,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -289,7 +289,7 @@ static int fakeintr(void *a) {return 0;}
  *  interrupt was serviced.
  *  Interrupts are numbered from 1 and up where 1 maps to HW int 0.
  */
-void *   
+void *
 generic_intr_establish(icp, irq, type, level, ih_fun, ih_arg, ih_what)
 	void *icp;
         u_long irq;	/* XXX pci_intr_handle_t compatible XXX */
@@ -453,7 +453,7 @@ static volatile int processing;
 
 	/* Don't recurse... */
 	if (processing)
-		return;	
+		return;
 	processing = 1;
 
 /* XXX interrupt vulnerable when changing ipending */
diff --git a/sys/arch/mips64/mips64/lcore_access.S b/sys/arch/mips64/mips64/lcore_access.S
index 84b3497b103..d1c5662d76a 100644
--- a/sys/arch/mips64/mips64/lcore_access.S
+++ b/sys/arch/mips64/mips64/lcore_access.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: lcore_access.S,v 1.3 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: lcore_access.S,v 1.4 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/lcore_ddb.S b/sys/arch/mips64/mips64/lcore_ddb.S
index 090bdf9add9..32734ef181c 100644
--- a/sys/arch/mips64/mips64/lcore_ddb.S
+++ b/sys/arch/mips64/mips64/lcore_ddb.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: lcore_ddb.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: lcore_ddb.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/lcore_float.S b/sys/arch/mips64/mips64/lcore_float.S
index 2a639ef91c4..43dfec0594f 100644
--- a/sys/arch/mips64/mips64/lcore_float.S
+++ b/sys/arch/mips64/mips64/lcore_float.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: lcore_float.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: lcore_float.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/mainbus.c b/sys/arch/mips64/mips64/mainbus.c
index f9e21face6d..6b7c2838cc3 100644
--- a/sys/arch/mips64/mips64/mainbus.c
+++ b/sys/arch/mips64/mips64/mainbus.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: mainbus.c,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: mainbus.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index b22fd69ef8f..5aba8c827de 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: pmap.c,v 1.2 2004/08/09 14:57:26 pefo Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -200,7 +200,7 @@ pmap_bootstrap()
 
 	/*
 	 * The R4?00 stores only one copy of the Global bit in the
-	 * translation lookaside buffer for each 2 page entry. 
+	 * translation lookaside buffer for each 2 page entry.
 	 * Thus invalid entrys must have the Global bit set so
 	 * when Entry LO and Entry HI G bits are anded together
 	 * they will produce a global bit to store in the tlb.
@@ -231,7 +231,7 @@ pmap_steal_memory(size, vstartp, vendp)
 	va = 0;
 
 	for(i = 0; i < vm_nphysseg && va == 0; i++) {
-		if(vm_physmem[i].avail_start != vm_physmem[i].start || 
+		if(vm_physmem[i].avail_start != vm_physmem[i].start ||
                     vm_physmem[i].avail_start >= vm_physmem[i].avail_end) {
 			continue;
 		}
@@ -250,7 +250,7 @@ pmap_steal_memory(size, vstartp, vendp)
 			}
 
 			vm_nphysseg--;
-			for(j = i; j < vm_nphysseg; x++) { 
+			for(j = i; j < vm_nphysseg; x++) {
 				vm_physmem[x] = vm_physmem[x + 1];
 			}
 		}
@@ -292,7 +292,7 @@ pmap_init()
 		s = vm_physmem[bank].end - vm_physmem[bank].start;
 		vm_physmem[bank].pmseg.pvent = pv;
 		pv += s;
-	} 
+	}
 
 #if 0 /* too early */
 	pool_setlowat(&pmap_pv_pool, pmap_pv_lowat);
@@ -618,7 +618,7 @@ void
 pmap_page_protect(pg, prot)
 	struct vm_page *pg;
 	vm_prot_t prot;
-{ 
+{
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
 	pv_entry_t pv;
 	vaddr_t va;
@@ -1066,7 +1066,7 @@ pmap_enter(pmap, va, pa, prot, stat)
 	else {
 		npte |= vad_to_pfn(pa);
 	}
-	if (pmapdebug & PDB_ENTER) { 
+	if (pmapdebug & PDB_ENTER) {
 		printf("pmap_enter: new pte %x", npte);
 		if (pmap->pm_tlbgen == tlbpid_gen)
 			printf(" tlbpid %d", pmap->pm_tlbpid);
diff --git a/sys/arch/mips64/mips64/process_machdep.c b/sys/arch/mips64/mips64/process_machdep.c
index e12f9e3a85a..50984cc86c8 100644
--- a/sys/arch/mips64/mips64/process_machdep.c
+++ b/sys/arch/mips64/mips64/process_machdep.c
@@ -1,6 +1,7 @@
-/*	$OpenBSD: process_machdep.c,v 1.2 2004/08/08 14:21:27 pefo Exp $	*/
+/*	$OpenBSD: process_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $	*/
+
 /*
- * Copyright (c) 1994 Adam Glass   
+ * Copyright (c) 1994 Adam Glass
  * Copyright (c) 1993 The Regents of the University of California.
  * Copyright (c) 1993 Jan-Simon Pendry
  * All rights reserved.
@@ -39,7 +40,7 @@
  * From:
  *	Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel
  *
- *	$Id: process_machdep.c,v 1.2 2004/08/08 14:21:27 pefo Exp $
+ *	$Id: process_machdep.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $
  */
 
 /*
diff --git a/sys/arch/mips64/mips64/sendsig.c b/sys/arch/mips64/mips64/sendsig.c
index b026cfa3103..7e7a58b02a1 100644
--- a/sys/arch/mips64/mips64/sendsig.c
+++ b/sys/arch/mips64/mips64/sendsig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sendsig.c,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: sendsig.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
  */
 /*
  * Copyright (c) 2001 Opsycon AB  (www.opsycon.se)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -131,7 +131,7 @@ sendsig(catcher, sig, mask, code, type, val)
 		psp->ps_sigstk.ss_flags |= SA_ONSTACK;
 	} else
 		fp = (struct sigframe *)(regs->sp - fsize);
-	if ((long)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize)) 
+	if ((long)fp <= USRSTACK - ctob(p->p_vmspace->vm_ssize))
 		(void)uvm_grow(p, (long)fp);
 #ifdef DEBUG
 	if ((sigdebug & SDB_FOLLOW) ||
@@ -187,7 +187,7 @@ bail:
 		psignal(p, SIGILL);
 		return;
 	}
-	/* 
+	/*
 	 * Build the argument list for the signal handler.
 	 */
 	regs->a0 = sig;
diff --git a/sys/arch/mips64/mips64/tlbhandler.S b/sys/arch/mips64/mips64/tlbhandler.S
index e96e69d6e5f..2ce86b1545e 100644
--- a/sys/arch/mips64/mips64/tlbhandler.S
+++ b/sys/arch/mips64/mips64/tlbhandler.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: tlbhandler.S,v 1.2 2004/08/09 14:57:26 pefo Exp $ */
+/*	$OpenBSD: tlbhandler.S,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -66,7 +66,7 @@ tlb_miss:
 	dmfc0	k0, COP_0_BAD_VADDR
 	PTR_S	zero, 2*REGSZ(k1)
 	PTR_S	zero, 3*REGSZ(k1)
-	bltz	k0, 1f			# kernel address 
+	bltz	k0, 1f			# kernel address
 	PTR_S	k0, REGSZ(k1)
 
 	PTR_L	k1, curprocpaddr
@@ -133,7 +133,7 @@ tlb_load:
 
 /*---------------------------------------------------------------- xtlb_miss
  *	Low level XTLB exception handler.
- * XXX!	This handler should be changed to handle larger segtabs. 
+ * XXX!	This handler should be changed to handle larger segtabs.
  */
 	.globl	xtlb_miss	/* 0xffffffff80000080 */
 	.set	noat
@@ -161,7 +161,7 @@ _inv_seg:
 _k_miss:
 	j	k_tlb_miss		# kernel tlbmiss.
 	dmfc0	k0, COP_0_BAD_VADDR	# must reload.
-	
+
 	.globl	e_tlb_miss
 e_tlb_miss:
 	.set	at
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 958c17fb4b1..543a220999d 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.2 2004/08/08 14:21:27 pefo Exp $	*/
+/*	$OpenBSD: trap.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $	*/
 /* tracked to 1.23 */
 
 /*
@@ -457,7 +457,7 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr
 			if (code >= numsys)
 				callp += p->p_emul->e_nosys; /* (illegal) */
 			else
-				callp += code; 
+				callp += code;
 			i = callp->sy_argsize / sizeof(int);
 			if (i > 2 && p->p_md.md_flags & MDP_O32) {
 					int32_t p[6];
@@ -600,9 +600,9 @@ printf("SIG-BUSB @%p pc %p, ra %p\n", trapframe->badvaddr, trapframe->pc, trapfr
 		 * Restore original instruction and clear BP
 		 */
 		iov.iov_base = (caddr_t)&p->p_md.md_ss_instr;
-		iov.iov_len = sizeof(int); 
+		iov.iov_len = sizeof(int);
 		uio.uio_iov = &iov;
-		uio.uio_iovcnt = 1; 
+		uio.uio_iovcnt = 1;
 		uio.uio_offset = (off_t)(int)va;
 		uio.uio_resid = sizeof(int);
 		uio.uio_segflg = UIO_SYSSPACE;
@@ -831,7 +831,7 @@ child_return(arg)
 #ifdef KTRACE
 	if (KTRPOINT(p, KTR_SYSRET))
 		ktrsysret(p, SYS_fork, 0, 0);
-#endif 
+#endif
 }
 
 #if defined(DDB) || defined(DEBUG)
@@ -1048,9 +1048,9 @@ cpu_singlestep(p)
 	 * Fetch what's at the current location.
 	 */
 	iov.iov_base = (caddr_t)&curinstr;
-	iov.iov_len = sizeof(int); 
+	iov.iov_len = sizeof(int);
 	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1; 
+	uio.uio_iovcnt = 1;
 	uio.uio_offset = (off_t)locr0->pc;
 	uio.uio_resid = sizeof(int);
 	uio.uio_segflg = UIO_SYSSPACE;
@@ -1075,9 +1075,9 @@ cpu_singlestep(p)
 	 * Fetch what's at the current location.
 	 */
 	iov.iov_base = (caddr_t)&p->p_md.md_ss_instr;
-	iov.iov_len = sizeof(int); 
+	iov.iov_len = sizeof(int);
 	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1; 
+	uio.uio_iovcnt = 1;
 	uio.uio_offset = (off_t)va;
 	uio.uio_resid = sizeof(int);
 	uio.uio_segflg = UIO_SYSSPACE;
@@ -1089,9 +1089,9 @@ cpu_singlestep(p)
 	 * Store breakpoint instruction at the "next" location now.
 	 */
 	iov.iov_base = (caddr_t)&bpinstr;
-	iov.iov_len = sizeof(int); 
+	iov.iov_len = sizeof(int);
 	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1; 
+	uio.uio_iovcnt = 1;
 	uio.uio_offset = (off_t)va;
 	uio.uio_resid = sizeof(int);
 	uio.uio_segflg = UIO_SYSSPACE;
@@ -1231,7 +1231,7 @@ loop:
 	more = 3;
 	mask = 0;
 	for (va = subr; more; va += sizeof(int),
-	     		      more = (more == 3) ? 3 : more - 1) {
+	    more = (more == 3) ? 3 : more - 1) {
 		/* stop if hit our current position */
 		if (va >= pc)
 			break;
diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c
index 85c248eefd3..2f325085671 100644
--- a/sys/arch/mips64/mips64/vm_machdep.c
+++ b/sys/arch/mips64/mips64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.1 2004/08/06 20:56:03 pefo Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.2 2004/08/10 20:15:47 deraadt Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -174,7 +174,7 @@ cpu_coredump(p, vp, cred, chdr)
 	error = vn_rdwr(UIO_WRITE, vp,
 			(caddr_t)(&(p -> p_addr -> u_pcb.pcb_regs)),
 			(off_t)chdr -> c_cpusize,
-	    		(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize),
+			(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize),
 			UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT,
 			cred, NULL, p);