whitespace

diff --git a/sys/arch/octeon/dev/mainbus.c b/sys/arch/octeon/dev/mainbus.c
index f0b4d0d..ef80004 100644 (file)
--- a/sys/arch/octeon/dev/mainbus.c
+++ b/sys/arch/octeon/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mainbus.c,v 1.6 2014/01/15 10:29:45 pirofti Exp $ */
+/*     $OpenBSD: mainbus.c,v 1.7 2014/07/14 10:23:58 jasper Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -62,7 +62,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
 #ifdef MULTIPROCESSOR
        struct cpu_hwinfo hw;
 #endif
-       
+
        printf("\n");
 
        bzero(&caa, sizeof caa);
@@ -75,7 +75,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
        caa.caa_hw = &hw;
        config_found(self, &caa, mainbus_print);
 #endif
-       
+
        caa.caa_maa.maa_name = "clock";
        config_found(self, &caa.caa_maa, mainbus_print);
 

diff --git a/sys/arch/octeon/include/mutex.h b/sys/arch/octeon/include/mutex.h
index c54baf3..53c8262 100644 (file)
--- a/sys/arch/octeon/include/mutex.h
+++ b/sys/arch/octeon/include/mutex.h
@@ -1,17 +1,17 @@
-/*     $OpenBSD: mutex.h,v 1.1 2010/09/20 06:32:30 syuu Exp $  */
+/*     $OpenBSD: mutex.h,v 1.2 2014/07/14 10:23:58 jasper Exp $        */
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
- * All rights reserved. 
+ * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission. 
+ *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -22,7 +22,7 @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN 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. 
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef _MACHINE_MUTEX_H_

diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h
index f4a2868..f3ba018 100644 (file)
--- a/sys/arch/octeon/include/octeonvar.h
+++ b/sys/arch/octeon/include/octeonvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: octeonvar.h,v 1.19 2014/07/12 20:31:52 jasper Exp $   */
+/*     $OpenBSD: octeonvar.h,v 1.20 2014/07/14 10:23:58 jasper Exp $   */
 /*     $NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $      */
 
 /*-
@@ -210,36 +210,36 @@ struct octeon_fau_map {
 #define OCTEON_MAXCPUS 4
 
 struct boot_desc {
-       uint32_t desc_ver;
-       uint32_t desc_size;
-       uint64_t stack_top;
-       uint64_t heap_start;
-       uint64_t heap_end;
-       uint64_t __unused17;
-       uint64_t __unused16;
-       uint32_t __unused18;
-       uint32_t __unused15;
-       uint32_t __unused14;
-       uint32_t argc;
-       uint32_t argv[OCTEON_ARGV_MAX];
-       uint32_t flags;
-       uint32_t core_mask;
-       uint32_t dram_size;
-       uint32_t phy_mem_desc_addr;
-       uint32_t debugger_flag_addr;
-       uint32_t eclock;
-       uint32_t __unused10;
-       uint32_t __unused9;
-       uint16_t __unused8;
-       uint8_t __unused7;
-       uint8_t __unused6;
-       uint16_t __unused5;
-       uint8_t __unused4;
-       uint8_t __unused3;
-       uint8_t __unused2[20];
-       uint8_t __unused1[6];
-       uint8_t __unused0;
-       uint64_t boot_info_addr;
+       uint32_t        desc_ver;
+       uint32_t        desc_size;
+       uint64_t        stack_top;
+       uint64_t        heap_start;
+       uint64_t        heap_end;
+       uint64_t        __unused17;
+       uint64_t        __unused16;
+       uint32_t        __unused18;
+       uint32_t        __unused15;
+       uint32_t        __unused14;
+       uint32_t        argc;
+       uint32_t        argv[OCTEON_ARGV_MAX];
+       uint32_t        flags;
+       uint32_t        core_mask;
+       uint32_t        dram_size;
+       uint32_t        phy_mem_desc_addr;
+       uint32_t        debugger_flag_addr;
+       uint32_t        eclock;
+       uint32_t        __unused10;
+       uint32_t        __unused9;
+       uint16_t        __unused8;
+       uint8_t         __unused7;
+       uint8_t         __unused6;
+       uint16_t        __unused5;
+       uint8_t         __unused4;
+       uint8_t         __unused3;
+       uint8_t         __unused2[20];
+       uint8_t         __unused1[6];
+       uint8_t         __unused0;
+       uint64_t        boot_info_addr;
 };
 
 struct boot_info {

diff --git a/sys/arch/octeon/stand/boot/libsa.h b/sys/arch/octeon/stand/boot/libsa.h
index 1d50caa..2f6ce10 100644 (file)
--- a/sys/arch/octeon/stand/boot/libsa.h
+++ b/sys/arch/octeon/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: libsa.h,v 1.3 2014/07/12 23:45:33 jasper Exp $        */
+/*     $OpenBSD: libsa.h,v 1.4 2014/07/14 10:23:58 jasper Exp $        */
 
 /*
  * Copyright (c) 2013 Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -42,4 +42,3 @@ int   cn30xxuartcngetc(dev_t);
  */
 void   delay(int);
 u_int  cp0_get_count(void);
-