trim trailing spaces that have accumulated over the years (these files

served as the basis for too many other platforms).

13 files changed, 72 insertions, 72 deletions

diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c
index 875f357..0508244 100644
--- a/sys/arm/xscale/i80321/ep80219_machdep.c
+++ b/sys/arm/xscale/i80321/ep80219_machdep.c
@@ -40,7 +40,7 @@
  *
  * Machine dependant functions for kernel setup
  *
- * This file needs a lot of work. 
+ * This file needs a lot of work.
  *
  * Created      : 17/09/94
  */
@@ -142,7 +142,7 @@ struct pv_addr minidataclean;
 
 /* Static device mappings. */
 static const struct pmap_devmap ep80219_devmap[] = {
-	/* 
+	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
 	 */
@@ -150,7 +150,7 @@ static const struct pmap_devmap ep80219_devmap[] = {
 		IQ80321_OBIO_BASE,
 		IQ80321_OBIO_BASE,
 		IQ80321_OBIO_SIZE,
-		VM_PROT_READ|VM_PROT_WRITE,                             
+		VM_PROT_READ|VM_PROT_WRITE,
 		PTE_NOCACHE,
 	},
 	{
@@ -159,7 +159,7 @@ static const struct pmap_devmap ep80219_devmap[] = {
 		VERDE_OUT_XLATE_IO_WIN_SIZE,
 		VM_PROT_READ|VM_PROT_WRITE,
 		PTE_NOCACHE,
-	},	    
+	},	
 	{
 		IQ80321_80321_VBASE,
 		VERDE_PMMR_BASE,
@@ -192,8 +192,8 @@ initarm(struct arm_boot_params *abp)
 	vm_offset_t lastaddr;
 	uint32_t memsize, memstart;
 
+	lastaddr = parse_boot_param(abp);
 	set_cpufuncs();
-	lastaddr = fake_preload_metadata();
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
 
@@ -222,7 +222,7 @@ initarm(struct arm_boot_params *abp)
 			kernel_pt_table[loop].pv_pa = freemempos +
 			    (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) *
 			    L2_TABLE_SIZE_REAL;
-			kernel_pt_table[loop].pv_va = 
+			kernel_pt_table[loop].pv_va =
 			    kernel_pt_table[loop].pv_pa + 0x20000000;
 		}
 	}
@@ -291,13 +291,13 @@ initarm(struct arm_boot_params *abp)
 				   (((uint32_t)(lastaddr) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1),
 				   VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	freemem_after = ((int)lastaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1);
-	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE 
+	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE
 																   - 1));
 	for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) {
 		pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000,
 					   &kernel_pt_table[KERNEL_PT_AFKERNEL + i]);
 	}
-	pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa, 
+	pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
 				   VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	
 
@@ -306,7 +306,7 @@ initarm(struct arm_boot_params *abp)
 		arm_add_smallalloc_pages((void *)(freemem_after),
 		    (void*)(freemem_after + PAGE_SIZE),
 		    afterkern - (freemem_after + PAGE_SIZE), 0);
-		    
+		
 	}
 #endif
 
@@ -338,7 +338,7 @@ initarm(struct arm_boot_params *abp)
 	 * of the stack memory.
 	 */
 
-				   
+				
 	set_stackptr(PSR_IRQ32_MODE,
 	    irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_ABT32_MODE,
@@ -386,7 +386,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[1] = 0xa0000000 + memsize;
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
-	pmap_bootstrap(pmap_curmaxkvaddr, 
+	pmap_bootstrap(pmap_curmaxkvaddr,
 	    0xd0000000, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c
index 053fe78..e65f38d 100644
--- a/sys/arm/xscale/i80321/i80321.c
+++ b/sys/arm/xscale/i80321/i80321.c
@@ -225,9 +225,9 @@ i80321_attach(struct i80321_softc *sc)
 
 static __inline uint32_t
 i80321_iintsrc_read(void)
-{       
-	uint32_t iintsrc;                                       
-		                                                                
+{
+	uint32_t iintsrc;
+		
 	__asm __volatile("mrc p6, 0, %0, c8, c0, 0"
 	    : "=r" (iintsrc));
 	
diff --git a/sys/arm/xscale/i80321/i80321_aau.c b/sys/arm/xscale/i80321/i80321_aau.c
index f72a7c9..288411b 100644
--- a/sys/arm/xscale/i80321/i80321_aau.c
+++ b/sys/arm/xscale/i80321/i80321_aau.c
@@ -111,14 +111,14 @@ i80321_aau_attach(device_t dev)
 
 	mtx_init(&softc->mtx, "AAU mtx", NULL, MTX_SPIN);
 	softc->sc_st = sc->sc_st;
-	if (bus_space_subregion(softc->sc_st, sc->sc_sh, VERDE_AAU_BASE, 
+	if (bus_space_subregion(softc->sc_st, sc->sc_sh, VERDE_AAU_BASE,
 	    VERDE_AAU_SIZE, &softc->sc_aau_sh) != 0)
 		panic("%s: unable to subregion AAU registers",
 		    device_get_name(dev));
 	if (bus_dma_tag_create(NULL, sizeof(i80321_aaudesc_t), 0,
-	    BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, 
+	    BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
 	    AAU_RING_SIZE * sizeof(i80321_aaudesc_t),
-	    1, sizeof(i80321_aaudesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex, 
+	    1, sizeof(i80321_aaudesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex,
 	    &Giant, &softc->dmatag))
 		panic("Couldn't create a dma tag");
 	if (bus_dmamem_alloc(softc->dmatag, (void **)&aaudescs,
@@ -186,7 +186,7 @@ aau_bzero(void *dst, int len, int flags)
 		desc->next_desc = 0;
 		desc->count = len;
 		desc->descr_ctrl = 2 << 1 | 1 << 31; /* Fill, enable dest write */
-		bus_dmamap_sync(sc->dmatag, sc->aauring[0].map, 
+		bus_dmamap_sync(sc->dmatag, sc->aauring[0].map,
 		    BUS_DMASYNC_PREWRITE);
 	} else {
 		test_virt_addr(dst, len);
@@ -218,8 +218,8 @@ aau_bzero(void *dst, int len, int flags)
 				if (tmplen <= 0 && descnb > 0) {
 					sc->aauring[descnb - 1].desc->next_desc
 					    = 0;
-					bus_dmamap_sync(sc->dmatag, 
-					    sc->aauring[descnb - 1].map, 
+					bus_dmamap_sync(sc->dmatag,
+					    sc->aauring[descnb - 1].map,
 					    BUS_DMASYNC_PREWRITE);
 				}
 				continue;
@@ -241,15 +241,15 @@ aau_bzero(void *dst, int len, int flags)
 			if (tmplen > 0) {
 				desc->next_desc = sc->aauring[descnb + 1].
 				    phys_addr;
-				bus_dmamap_sync(sc->dmatag, 
-				    sc->aauring[descnb].map, 
+				bus_dmamap_sync(sc->dmatag,
+				    sc->aauring[descnb].map,
 				    BUS_DMASYNC_PREWRITE);
 				desc = sc->aauring[descnb + 1].desc;
 				descnb++;
 			} else {
 				desc->next_desc = 0;
-				bus_dmamap_sync(sc->dmatag, 
-				    sc->aauring[descnb].map, 
+				bus_dmamap_sync(sc->dmatag,
+				    sc->aauring[descnb].map,
 				    BUS_DMASYNC_PREWRITE);
 			}
 									
diff --git a/sys/arm/xscale/i80321/i80321_dma.c b/sys/arm/xscale/i80321/i80321_dma.c
index 4ec6d16..abf7dcc 100644
--- a/sys/arm/xscale/i80321/i80321_dma.c
+++ b/sys/arm/xscale/i80321/i80321_dma.c
@@ -115,13 +115,13 @@ i80321_dma_attach(device_t dev)
 	mtx_init(&softc->mtx, "DMA engine mtx", NULL, MTX_SPIN);
 	softc->sc_st = sc->sc_st;
 	if (bus_space_subregion(softc->sc_st, sc->sc_sh, unit == 0 ?
-	    VERDE_DMA_BASE0 : VERDE_DMA_BASE1, VERDE_DMA_SIZE, 
+	    VERDE_DMA_BASE0 : VERDE_DMA_BASE1, VERDE_DMA_SIZE,
 	    &softc->sc_dma_sh) != 0)
 		panic("%s: unable to subregion DMA registers",
 		    device_get_name(dev));
 	if (bus_dma_tag_create(NULL, sizeof(i80321_dmadesc_t),
-	    0, BUS_SPACE_MAXADDR,  BUS_SPACE_MAXADDR, NULL, NULL, 
-	    DMA_RING_SIZE * sizeof(i80321_dmadesc_t), 1, 
+	    0, BUS_SPACE_MAXADDR,  BUS_SPACE_MAXADDR, NULL, NULL,
+	    DMA_RING_SIZE * sizeof(i80321_dmadesc_t), 1,
 	    sizeof(i80321_dmadesc_t), BUS_DMA_ALLOCNOW, busdma_lock_mutex,
 	    &Giant, &softc->dmatag))
 		panic("Couldn't create a dma tag");
@@ -131,7 +131,7 @@ i80321_dma_attach(device_t dev)
 		panic("Couldn't alloc dma memory");
 	for (int i = 0; i < DMA_RING_SIZE; i++) {
 		if (i > 0)
-			if (bus_dmamap_create(softc->dmatag, 0, 
+			if (bus_dmamap_create(softc->dmatag, 0,
 			    &softc->dmaring[i].map))
 				panic("Couldn't alloc dmamap");
 		softc->dmaring[i].desc = &dmadescs[i];	
@@ -213,11 +213,11 @@ dma_memcpy(void *dst, void *src, int len, int flags)
 		desc->local_addr = (vm_paddr_t)dst;
 		desc->count = len;
 		desc->descr_ctrl = 1 << 6; /* Local memory to local memory. */
-		bus_dmamap_sync(sc->dmatag, 
-		    sc->dmaring[0].map, 
+		bus_dmamap_sync(sc->dmatag,
+		    sc->dmaring[0].map,
 		    BUS_DMASYNC_PREWRITE);
 	} else {
-		if (!virt_addr_is_valid(dst, len, 1, !(flags & DST_IS_USER)) || 
+		if (!virt_addr_is_valid(dst, len, 1, !(flags & DST_IS_USER)) ||
 		    !virt_addr_is_valid(src, len, 0, !(flags & SRC_IS_USER))) {
 			mtx_lock_spin(&sc->mtx);
 			sc->flags &= ~BUSY;
@@ -275,8 +275,8 @@ dma_memcpy(void *dst, void *src, int len, int flags)
 				if (tmplen <= 0 && descnb > 0) {
 					sc->dmaring[descnb - 1].desc->next_desc
 					    = 0;
-					bus_dmamap_sync(sc->dmatag, 
-					    sc->dmaring[descnb - 1].map, 
+					bus_dmamap_sync(sc->dmatag,
+					    sc->dmaring[descnb - 1].map,
 					    BUS_DMASYNC_PREWRITE);
 				}
 				continue;
@@ -301,8 +301,8 @@ dma_memcpy(void *dst, void *src, int len, int flags)
 			if (tmplen > 0) {
 				desc->next_desc = sc->dmaring[descnb + 1].
 				    phys_addr;
-				bus_dmamap_sync(sc->dmatag, 
-				    sc->dmaring[descnb].map, 
+				bus_dmamap_sync(sc->dmatag,
+				    sc->dmaring[descnb].map,
 				    BUS_DMASYNC_PREWRITE);
 				desc = sc->dmaring[descnb + 1].desc;
 				descnb++;
diff --git a/sys/arm/xscale/i80321/i80321_intr.h b/sys/arm/xscale/i80321/i80321_intr.h
index 4e432da..bde0bac 100644
--- a/sys/arm/xscale/i80321/i80321_intr.h
+++ b/sys/arm/xscale/i80321/i80321_intr.h
@@ -33,7 +33,7 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * $FreeBSD$
  *
  */
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 36c90d6..dfb4c46 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -79,7 +79,7 @@ static int
 i80321_pci_attach(device_t dev)
 {
 
-	uint32_t busno;                                       
+	uint32_t busno;
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 
 	sc->sc_st = i80321_softc->sc_st;
@@ -100,16 +100,16 @@ i80321_pci_attach(device_t dev)
 	sc->sc_io_rman.rm_type = RMAN_ARRAY;
 	sc->sc_io_rman.rm_descr = "I80321 PCI I/O Ports";
 	if (rman_init(&sc->sc_io_rman) != 0 ||
-		rman_manage_region(&sc->sc_io_rman, 
-		sc->sc_io, 
-		    sc->sc_io + 
+		rman_manage_region(&sc->sc_io_rman,
+		sc->sc_io,
+		    sc->sc_io +
 		    VERDE_OUT_XLATE_IO_WIN_SIZE) != 0) {
 		panic("i80321_pci_probe: failed to set up I/O rman");
 	}
 	sc->sc_mem_rman.rm_type = RMAN_ARRAY;
 	sc->sc_mem_rman.rm_descr = "I80321 PCI Memory";
 	if (rman_init(&sc->sc_mem_rman) != 0 ||
-	    rman_manage_region(&sc->sc_mem_rman, 
+	    rman_manage_region(&sc->sc_mem_rman,
 	    0, VERDE_OUT_XLATE_MEM_WIN_SIZE) != 0) {
 		panic("i80321_pci_probe: failed to set up memory rman");
 	}
@@ -325,7 +325,7 @@ i80321_pci_alloc_resource(device_t bus, device_t child, int type, int *rid,
 				rman_release_resource(rv);
 				return (NULL);
 			}
-		} 
+		}
 	}
 	return (rv);
 }
@@ -340,7 +340,7 @@ i80321_pci_activate_resource(device_t bus, device_t child, int type, int rid,
 	if (type == SYS_RES_MEMORY) {
 		error = bus_space_map(rman_get_bustag(r),
 		    rman_get_bushandle(r), rman_get_size(r), 0, &p);
-		if (error) 
+		if (error)
 			return (error);
 		rman_set_bushandle(r, p);
 	
@@ -350,8 +350,8 @@ i80321_pci_activate_resource(device_t bus, device_t child, int type, int rid,
 
 static int
 i80321_pci_setup_intr(device_t dev, device_t child,
-    struct resource *ires, int flags, driver_filter_t *filt, 
-    driver_intr_t *intr, void *arg, void **cookiep)    
+    struct resource *ires, int flags, driver_filter_t *filt,
+    driver_intr_t *intr, void *arg, void **cookiep)
 {
 	return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
 	    filt, intr, arg, cookiep));
diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index f741e89..ebb0306 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -279,7 +279,7 @@ i80321_io_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
 	panic("i80321_io_bs_alloc(): not implemented");
 }
 
-void    
+void
 i80321_io_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
 
@@ -299,7 +299,7 @@ i80321_mem_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
 	endpa = round_page(bpa + size);
 
 	*bshp = (vm_offset_t)pmap_mapdev(pa, endpa - pa);
-		       
+		
 	return (0);
 }
 
@@ -324,7 +324,7 @@ i80321_mem_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
 	panic("i80321_mem_bs_alloc(): not implemented");
 }
 
-void    
+void
 i80321_mem_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
 
diff --git a/sys/arm/xscale/i80321/i80321_timer.c b/sys/arm/xscale/i80321/i80321_timer.c
index 78492b8..98c1805 100644
--- a/sys/arm/xscale/i80321/i80321_timer.c
+++ b/sys/arm/xscale/i80321/i80321_timer.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/xscale/i80321/i80321var.h>
 
 #ifdef CPU_XSCALE_81342
-#define ICU_INT_TIMER0	(8) /* XXX: Can't include i81342reg.h because 
+#define ICU_INT_TIMER0	(8) /* XXX: Can't include i81342reg.h because
 			       definitions overrides the ones from i80321reg.h
 			       */
 #endif
@@ -79,7 +79,7 @@ static unsigned i80321_timer_get_timecount(struct timecounter *tc);
 
 static uint32_t counts_per_hz;
 
-#if defined(XSCALE_DISABLE_CCNT) || defined(CPU_XSCALE_81342) 
+#if defined(XSCALE_DISABLE_CCNT) || defined(CPU_XSCALE_81342)
 static uint32_t offset;
 static uint32_t last = -1;
 #endif
@@ -383,17 +383,17 @@ cpu_initclocks(void)
 
 	oldirqstate = disable_interrupts(I32_bit);
 
-	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 
+	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
 #ifdef CPU_XSCALE_81342
 	    ICU_INT_TIMER0, ICU_INT_TIMER0,
 #else
-	    ICU_INT_TMR0, ICU_INT_TMR0, 
+	    ICU_INT_TMR0, ICU_INT_TMR0,
 #endif
 	    1, RF_ACTIVE);
 	if (!irq)
 		panic("Unable to setup the clock irq handler.\n");
 	else
-		bus_setup_intr(dev, irq, INTR_TYPE_CLK, clockhandler, NULL, 
+		bus_setup_intr(dev, irq, INTR_TYPE_CLK, clockhandler, NULL,
 		    NULL, &ihl);
 	tmr0_write(0);			/* stop timer */
 	tisr_write(TISR_TMR0);		/* clear interrupt */
diff --git a/sys/arm/xscale/i80321/i80321reg.h b/sys/arm/xscale/i80321/i80321reg.h
index 5804e99..53617f9 100644
--- a/sys/arm/xscale/i80321/i80321reg.h
+++ b/sys/arm/xscale/i80321/i80321reg.h
@@ -38,8 +38,8 @@
  *
  */
 
-#ifndef _ARM_XSCALE_I80321REG_H_ 
-#define _ARM_XSCALE_I80321REG_H_ 
+#ifndef _ARM_XSCALE_I80321REG_H_
+#define _ARM_XSCALE_I80321REG_H_
 
 /*
  * Register definitions for the Intel 80321 (``Verde'') I/O processor,
@@ -102,7 +102,7 @@
 #if defined(CPU_XSCALE_80321)
 #define	VERDE_AAU_BASE			0x0800
 #define	VERDE_AAU_SIZE			0x0100
-#endif 
+#endif
 
 #define	VERDE_I2C_BASE			0x1680
 #define	VERDE_I2C_BASE0			(VERDE_I2C_BASE + 0x00)
diff --git a/sys/arm/xscale/i80321/iq31244_7seg.c b/sys/arm/xscale/i80321/iq31244_7seg.c
index 3ac090d..3737094 100644
--- a/sys/arm/xscale/i80321/iq31244_7seg.c
+++ b/sys/arm/xscale/i80321/iq31244_7seg.c
@@ -206,7 +206,7 @@ static const uint8_t digitmap[] = {
 	SEG_D|SEG_E,
 };
 
-static uint8_t 
+static uint8_t
 iq80321_7seg_xlate(char c)
 {
 	uint8_t rv;
@@ -336,7 +336,7 @@ static const uint8_t snakemap[][2] = {
 
 static SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
 static int freq = 20;
-SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0, 
+SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0,
     "7 Seg update frequency");
 static void
 iq31244_7seg_snake(void)
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index ae642c5..9790c0b 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -40,7 +40,7 @@
  *
  * Machine dependant functions for kernel setup
  *
- * This file needs a lot of work. 
+ * This file needs a lot of work.
  *
  * Created      : 17/09/94
  */
@@ -140,7 +140,7 @@ struct pv_addr minidataclean;
 #define IQ80321_OBIO_SIZE 0x00100000UL
 /* Static device mappings. */
 static const struct pmap_devmap iq80321_devmap[] = {
-	/* 
+	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
 	 */
@@ -148,7 +148,7 @@ static const struct pmap_devmap iq80321_devmap[] = {
 		    IQ80321_OBIO_BASE,
 		    IQ80321_OBIO_BASE,
 		    IQ80321_OBIO_SIZE,
-		    VM_PROT_READ|VM_PROT_WRITE,                             
+		    VM_PROT_READ|VM_PROT_WRITE,
 		    PTE_NOCACHE,
 	    },
 	    {
@@ -158,7 +158,7 @@ static const struct pmap_devmap iq80321_devmap[] = {
 		    VM_PROT_READ|VM_PROT_WRITE,
 		    PTE_NOCACHE,
 	    },
-	    
+	
 	    {
 		    IQ80321_80321_VBASE,
 		    VERDE_PMMR_BASE,
@@ -193,8 +193,8 @@ initarm(struct arm_boot_params *abp)
 	vm_offset_t lastaddr;
 	uint32_t memsize, memstart;
 
+	lastaddr = parse_boot_param(abp);
 	set_cpufuncs();
-	lastaddr = fake_preload_metadata();
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
 
@@ -223,7 +223,7 @@ initarm(struct arm_boot_params *abp)
 			kernel_pt_table[loop].pv_pa = freemempos +
 			    (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) *
 			    L2_TABLE_SIZE_REAL;
-			kernel_pt_table[loop].pv_va = 
+			kernel_pt_table[loop].pv_va =
 			    kernel_pt_table[loop].pv_pa + 0x20000000;
 		}
 	}
@@ -290,13 +290,13 @@ initarm(struct arm_boot_params *abp)
 	   (((uint32_t)(lastaddr) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1),
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	freemem_after = ((int)lastaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1);
-	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE 
+	afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE
 	    - 1));
 	for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) {
 		pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000,
 		    &kernel_pt_table[KERNEL_PT_AFKERNEL + i]);
 	}
-	pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa, 
+	pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	
 
@@ -305,7 +305,7 @@ initarm(struct arm_boot_params *abp)
 		arm_add_smallalloc_pages((void *)(freemem_after),
 		    (void*)(freemem_after + PAGE_SIZE),
 		    afterkern - (freemem_after + PAGE_SIZE), 0);
-		    
+		
 	}
 #endif
 
@@ -337,7 +337,7 @@ initarm(struct arm_boot_params *abp)
 	 * of the stack memory.
 	 */
 
-				   
+				
 	set_stackptr(PSR_IRQ32_MODE,
 	    irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_ABT32_MODE,
@@ -393,7 +393,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
-	pmap_bootstrap(pmap_curmaxkvaddr, 
+	pmap_bootstrap(pmap_curmaxkvaddr,
 	    0xd0000000, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index 7a875bf..f43f8e4 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -324,7 +324,7 @@ arm_unmask_irq(uintptr_t nb)
 
 void
 cpu_reset()
-{       
+{
 	(void) disable_interrupts(I32_bit|F32_bit);
 	*(__volatile uint32_t *)(IQ80321_80321_VBASE + VERDE_ATU_BASE +
 	    ATU_PCSR) = PCSR_RIB | PCSR_RPB;
@@ -351,7 +351,7 @@ iq80321_alloc_resource(device_t dev, device_t child, int type, int *rid,
 
 static int
 iq80321_setup_intr(device_t dev, device_t child,
-    struct resource *ires, int flags, driver_filter_t *filt, 
+    struct resource *ires, int flags, driver_filter_t *filt,
     driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int error;
diff --git a/sys/arm/xscale/i80321/obio.c b/sys/arm/xscale/i80321/obio.c
index f6ed791..566d6cd 100644
--- a/sys/arm/xscale/i80321/obio.c
+++ b/sys/arm/xscale/i80321/obio.c
@@ -120,7 +120,7 @@ obio_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
-	if (rv == NULL) 
+	if (rv == NULL)
 		return (NULL);
 	if (type == SYS_RES_IRQ)
 		return (rv);