Module Name: src
Committed By: simonb
Date: Thu Apr 1 04:35:48 UTC 2021
Modified Files:
src/sys/arch/amd64/include: types.h
src/sys/arch/atari/include: types.h
src/sys/arch/bebox/include: types.h
src/sys/arch/cats/include: types.h
src/sys/arch/emips/include: types.h
src/sys/arch/evbarm/include: types.h
src/sys/arch/hpcsh/include: types.h
src/sys/arch/hppa/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/ia64/include: types.h
src/sys/arch/landisk/include: types.h
src/sys/arch/mvmeppc/include: types.h
src/sys/arch/netwinder/include: types.h
src/sys/arch/or1k/include: types.h
src/sys/arch/powerpc/include: types.h
src/sys/arch/prep/include: types.h
src/sys/arch/riscv/include: types.h
src/sys/arch/rs6000/include: types.h
src/sys/arch/sandpoint/include: types.h
src/sys/arch/sgimips/include: types.h
src/sys/arch/sun2/include: types.h
src/sys/arch/sun3/include: types.h
src/sys/arch/usermode/include: types.h
src/sys/arch/vax/include: types.h
Log Message:
Whitespace: #define<tab>
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/atari/include/types.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/bebox/include/types.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cats/include/types.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/include/types.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/include/types.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcsh/include/types.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hppa/include/types.h
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/include/types.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/landisk/include/types.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvmeppc/include/types.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/netwinder/include/types.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/or1k/include/types.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/prep/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/include/types.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/rs6000/include/types.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/include/types.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sgimips/include/types.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sun2/include/types.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun3/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/include/types.h
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/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.70 src/sys/arch/amd64/include/types.h:1.71
--- src/sys/arch/amd64/include/types.h:1.70 Sat Jan 23 19:38:52 2021
+++ src/sys/arch/amd64/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.70 2021/01/23 19:38:52 christos Exp $ */
+/* $NetBSD: types.h,v 1.71 2021/04/01 04:35:45 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@ typedef unsigned char __cpu_simple_lock
#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_CPU_COUNTER
#define __HAVE_CPU_DATA_FIRST
-#define __HAVE_CPU_BOOTCONF
+#define __HAVE_CPU_BOOTCONF
#define __HAVE_MD_CPU_OFFLINE
#define __HAVE_SYSCALL_INTERN
#define __HAVE_MINIMAL_EMUL
@@ -109,7 +109,7 @@ typedef unsigned char __cpu_simple_lock
#include "opt_kasan.h"
#include "opt_kmsan.h"
#ifdef KASAN
-#define __HAVE_KASAN_INSTR_BUS
+#define __HAVE_KASAN_INSTR_BUS
#endif
#if defined(__x86_64__) && !defined(XENPV)
#if !defined(KASAN) && !defined(KMSAN)
Index: src/sys/arch/atari/include/types.h
diff -u src/sys/arch/atari/include/types.h:1.17 src/sys/arch/atari/include/types.h:1.18
--- src/sys/arch/atari/include/types.h:1.17 Sat Jan 23 19:38:52 2021
+++ src/sys/arch/atari/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,12 +1,12 @@
-/* $NetBSD: types.h,v 1.17 2021/01/23 19:38:52 christos Exp $ */
+/* $NetBSD: types.h,v 1.18 2021/04/01 04:35:45 simonb Exp $ */
#ifndef _MACHINE_TYPES_H_
#define _MACHINE_TYPES_H_
#include <m68k/types.h>
-#define __HAVE_MM_MD_READWRITE
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_MM_MD_READWRITE
+#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_BUS_SPACE_8
#endif
Index: src/sys/arch/bebox/include/types.h
diff -u src/sys/arch/bebox/include/types.h:1.12 src/sys/arch/bebox/include/types.h:1.13
--- src/sys/arch/bebox/include/types.h:1.12 Sun Jul 17 23:27:02 2011
+++ src/sys/arch/bebox/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: types.h,v 1.12 2011/07/17 23:27:02 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.13 2021/04/01 04:35:45 simonb Exp $ */
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#include <powerpc/types.h>
Index: src/sys/arch/cats/include/types.h
diff -u src/sys/arch/cats/include/types.h:1.14 src/sys/arch/cats/include/types.h:1.15
--- src/sys/arch/cats/include/types.h:1.14 Thu Jan 26 15:55:09 2017
+++ src/sys/arch/cats/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: types.h,v 1.14 2017/01/26 15:55:09 christos Exp $ */
+/* $NetBSD: types.h,v 1.15 2021/04/01 04:35:45 simonb Exp $ */
#ifndef _CATS_TYPES_H_
#define _CATS_TYPES_H_
-#define __HAVE_FAST_SOFTINTS
+#define __HAVE_FAST_SOFTINTS
#include <arm/arm32/types.h>
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_COMPAT_NETBSD32
#endif
Index: src/sys/arch/emips/include/types.h
diff -u src/sys/arch/emips/include/types.h:1.2 src/sys/arch/emips/include/types.h:1.3
--- src/sys/arch/emips/include/types.h:1.2 Sun Jun 12 04:22:18 2011
+++ src/sys/arch/emips/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: types.h,v 1.2 2011/06/12 04:22:18 tsutsui Exp $ */
+/* $NetBSD: types.h,v 1.3 2021/04/01 04:35:45 simonb Exp $ */
#include <mips/types.h>
#define __HAVE_DEVICE_REGISTER
#define __HAVE_GENERIC_SOFT_INTERRUPTS
/* We'll use the FreeRunning counter everywhere */
-#define __HAVE_TIMECOUNTER
+#define __HAVE_TIMECOUNTER
/* MIPS specific options */
#define __HAVE_BOOTINFO_H
Index: src/sys/arch/evbarm/include/types.h
diff -u src/sys/arch/evbarm/include/types.h:1.14 src/sys/arch/evbarm/include/types.h:1.15
--- src/sys/arch/evbarm/include/types.h:1.14 Sun Apr 1 04:35:05 2018
+++ src/sys/arch/evbarm/include/types.h Thu Apr 1 04:35:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.14 2018/04/01 04:35:05 ryo Exp $ */
+/* $NetBSD: types.h,v 1.15 2021/04/01 04:35:45 simonb Exp $ */
#ifndef _EVBARM_TYPES_H_
#define _EVBARM_TYPES_H_
@@ -6,7 +6,7 @@
#ifdef __aarch64__
#include <aarch64/types.h>
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_DEVICE_REGISTER
#else
#include <arm/arm32/types.h>
Index: src/sys/arch/hpcsh/include/types.h
diff -u src/sys/arch/hpcsh/include/types.h:1.5 src/sys/arch/hpcsh/include/types.h:1.6
--- src/sys/arch/hpcsh/include/types.h:1.5 Sat Jan 23 19:38:52 2021
+++ src/sys/arch/hpcsh/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,10 +1,10 @@
-/* $NetBSD: types.h,v 1.5 2021/01/23 19:38:52 christos Exp $ */
+/* $NetBSD: types.h,v 1.6 2021/04/01 04:35:46 simonb Exp $ */
#ifndef _HPCSH_TYPES_H_
#define _HPCSH_TYPES_H_
#include <sh3/types.h>
-#define __HAVE_DEVICE_REGISTER
+#define __HAVE_DEVICE_REGISTER
#define __HAVE_BUS_SPACE_8
#endif /* _HPCSH_TYPES_H_ */
Index: src/sys/arch/hppa/include/types.h
diff -u src/sys/arch/hppa/include/types.h:1.30 src/sys/arch/hppa/include/types.h:1.31
--- src/sys/arch/hppa/include/types.h:1.30 Sat Jan 23 19:38:52 2021
+++ src/sys/arch/hppa/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.30 2021/01/23 19:38:52 christos Exp $ */
+/* $NetBSD: types.h,v 1.31 2021/04/01 04:35:46 simonb Exp $ */
/* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */
@@ -80,8 +80,8 @@ typedef struct {
typedef int __register_t;
-#define __SIMPLELOCK_LOCKED { { 0, 0, 0, 0} }
-#define __SIMPLELOCK_UNLOCKED { { 1, 1, 1, 1} }
+#define __SIMPLELOCK_LOCKED { { 0, 0, 0, 0} }
+#define __SIMPLELOCK_UNLOCKED { { 1, 1, 1, 1} }
#define __MACHINE_STACK_GROWS_UP /* stack grows to higher addresses */
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.92 src/sys/arch/i386/include/types.h:1.93
--- src/sys/arch/i386/include/types.h:1.92 Sat Aug 1 12:14:40 2020
+++ src/sys/arch/i386/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.92 2020/08/01 12:14:40 jdolecek Exp $ */
+/* $NetBSD: types.h,v 1.93 2021/04/01 04:35:46 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -123,7 +123,7 @@ typedef __register_t register_t;
* other run-in-userspace code defines _KERNEL, but is careful not to
* build anything using 64bit atomic ops by default.
*/
-#define __HAVE_ATOMIC64_OPS
+#define __HAVE_ATOMIC64_OPS
#endif
#define __HAVE_ATOMIC_AS_MEMBAR
#define __HAVE_CPU_LWP_SETPRIVATE
Index: src/sys/arch/ia64/include/types.h
diff -u src/sys/arch/ia64/include/types.h:1.13 src/sys/arch/ia64/include/types.h:1.14
--- src/sys/arch/ia64/include/types.h:1.13 Sat Jan 23 19:38:52 2021
+++ src/sys/arch/ia64/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.13 2021/01/23 19:38:52 christos Exp $ */
+/* $NetBSD: types.h,v 1.14 2021/04/01 04:35:46 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -78,7 +78,7 @@ typedef long int __register_t;
#define __HAVE_BUS_SPACE_8
#if defined(_KERNEL)
-#define __HAVE_RAS
+#define __HAVE_RAS
#endif
#endif /* _MACHTYPES_H_ */
Index: src/sys/arch/landisk/include/types.h
diff -u src/sys/arch/landisk/include/types.h:1.5 src/sys/arch/landisk/include/types.h:1.6
--- src/sys/arch/landisk/include/types.h:1.5 Sat Jan 23 19:38:53 2021
+++ src/sys/arch/landisk/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: types.h,v 1.5 2021/01/23 19:38:53 christos Exp $ */
+/* $NetBSD: types.h,v 1.6 2021/04/01 04:35:46 simonb Exp $ */
#ifndef _LANDISK_TYPES_H_
#define _LANDISK_TYPES_H_
#include <sh3/types.h>
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_BUS_SPACE_8
#endif /* _LANDISK_TYPES_H_ */
Index: src/sys/arch/mvmeppc/include/types.h
diff -u src/sys/arch/mvmeppc/include/types.h:1.8 src/sys/arch/mvmeppc/include/types.h:1.9
--- src/sys/arch/mvmeppc/include/types.h:1.8 Sun Jul 17 23:23:53 2011
+++ src/sys/arch/mvmeppc/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: types.h,v 1.8 2011/07/17 23:23:53 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.9 2021/04/01 04:35:46 simonb Exp $ */
#include <powerpc/types.h>
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
Index: src/sys/arch/netwinder/include/types.h
diff -u src/sys/arch/netwinder/include/types.h:1.12 src/sys/arch/netwinder/include/types.h:1.13
--- src/sys/arch/netwinder/include/types.h:1.12 Thu Jan 26 15:55:10 2017
+++ src/sys/arch/netwinder/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $ */
+/* $NetBSD: types.h,v 1.13 2021/04/01 04:35:46 simonb Exp $ */
#ifndef _NETWINDER_TYPES_H_
#define _NETWINDER_TYPES_H_
#include <arm/arm32/types.h>
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#define __HAVE_COMPAT_NETBSD32
#endif
Index: src/sys/arch/or1k/include/types.h
diff -u src/sys/arch/or1k/include/types.h:1.6 src/sys/arch/or1k/include/types.h:1.7
--- src/sys/arch/or1k/include/types.h:1.6 Sat Jan 23 19:38:53 2021
+++ src/sys/arch/or1k/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.6 2021/01/23 19:38:53 christos Exp $ */
+/* $NetBSD: types.h,v 1.7 2021/04/01 04:35:46 simonb Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#ifndef _OR1K_TYPES_H_
-#define _OR1K_TYPES_H_
+#define _OR1K_TYPES_H_
#include <sys/cdefs.h>
#include <sys/featuretest.h>
@@ -44,12 +44,12 @@ typedef __UINTPTR_TYPE__ paddr_t;
typedef __UINTPTR_TYPE__ psize_t;
typedef __UINTPTR_TYPE__ vaddr_t;
typedef __UINTPTR_TYPE__ vsize_t;
-#define PRIxPADDR PRIxPTR
-#define PRIxPSIZE PRIxPTR
-#define PRIuPSIZE PRIuPTR
-#define PRIxVADDR PRIxPTR
-#define PRIxVSIZE PRIxPTR
-#define PRIuVSIZE PRIuPTR
+#define PRIxPADDR PRIxPTR
+#define PRIxPSIZE PRIxPTR
+#define PRIuPSIZE PRIuPTR
+#define PRIxVADDR PRIxPTR
+#define PRIxVSIZE PRIxPTR
+#define PRIuVSIZE PRIuPTR
typedef unsigned long int register_t;
@@ -65,23 +65,23 @@ typedef struct label_t { /* Used by setj
typedef unsigned int __cpu_simple_lock_nv_t;
typedef unsigned long int __register_t;
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
+#define __SIMPLELOCK_LOCKED 1
+#define __SIMPLELOCK_UNLOCKED 0
-#define __HAVE_FAST_SOFTINTS
-#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#define __HAVE_CPU_COUNTER
-#define __HAVE_SYSCALL_INTERN
-#define __HAVE_NEW_STYLE_BUS_H
-#define __HAVE_MINIMAL_EMUL
-#define __HAVE_CPU_DATA_FIRST
-#define __HAVE___LWP_GETPRIVATE_FAST
-#define __HAVE_COMMON___TLS_GET_ADDR
-#define __HAVE_TLS_VARIANT_I
+#define __HAVE_FAST_SOFTINTS
+#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define __HAVE_CPU_COUNTER
+#define __HAVE_SYSCALL_INTERN
+#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_MINIMAL_EMUL
+#define __HAVE_CPU_DATA_FIRST
+#define __HAVE___LWP_GETPRIVATE_FAST
+#define __HAVE_COMMON___TLS_GET_ADDR
+#define __HAVE_TLS_VARIANT_I
#define __HAVE_BUS_SPACE_8
#if defined(_KERNEL)
-#define __HAVE_RAS
+#define __HAVE_RAS
#endif
#endif /* _OR1K_TYPES_H_ */
Index: src/sys/arch/powerpc/include/types.h
diff -u src/sys/arch/powerpc/include/types.h:1.65 src/sys/arch/powerpc/include/types.h:1.66
--- src/sys/arch/powerpc/include/types.h:1.65 Sat Jan 23 19:38:53 2021
+++ src/sys/arch/powerpc/include/types.h Thu Apr 1 04:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.65 2021/01/23 19:38:53 christos Exp $ */
+/* $NetBSD: types.h,v 1.66 2021/04/01 04:35:46 simonb Exp $ */
/*-
* Copyright (C) 1995 Wolfgang Solfrank.
@@ -75,12 +75,12 @@ typedef struct label_t {
typedef __uint32_t tlb_asid_t; /* for booke */
#endif
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
+#define __SIMPLELOCK_LOCKED 1
+#define __SIMPLELOCK_UNLOCKED 0
-#define __HAVE_CPU_COUNTER
-#define __HAVE_NEW_STYLE_BUS_H
-#define __HAVE_SYSCALL_INTERN
+#define __HAVE_CPU_COUNTER
+#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_SYSCALL_INTERN
#define __HAVE_CPU_DATA_FIRST
#define __HAVE_CPU_UAREA_ROUTINES
#ifdef _LP64
Index: src/sys/arch/prep/include/types.h
diff -u src/sys/arch/prep/include/types.h:1.13 src/sys/arch/prep/include/types.h:1.14
--- src/sys/arch/prep/include/types.h:1.13 Sun Jul 17 23:27:02 2011
+++ src/sys/arch/prep/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,5 +1,5 @@
-/* $NetBSD: types.h,v 1.13 2011/07/17 23:27:02 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.14 2021/04/01 04:35:47 simonb Exp $ */
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#include <powerpc/types.h>
Index: src/sys/arch/riscv/include/types.h
diff -u src/sys/arch/riscv/include/types.h:1.9 src/sys/arch/riscv/include/types.h:1.10
--- src/sys/arch/riscv/include/types.h:1.9 Sun Mar 22 17:33:59 2020
+++ src/sys/arch/riscv/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.9 2020/03/22 17:33:59 ad Exp $ */
+/* $NetBSD: types.h,v 1.10 2021/04/01 04:35:47 simonb Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#ifndef _RISCV_TYPES_H_
-#define _RISCV_TYPES_H_
+#define _RISCV_TYPES_H_
#include <sys/cdefs.h>
#include <sys/featuretest.h>
@@ -41,25 +41,25 @@ typedef __UINTPTR_TYPE__ paddr_t;
typedef __UINTPTR_TYPE__ psize_t;
typedef __UINTPTR_TYPE__ vaddr_t;
typedef __UINTPTR_TYPE__ vsize_t;
-#define PRIxPADDR PRIxPTR
-#define PRIxPSIZE PRIxPTR
-#define PRIuPSIZE PRIuPTR
-#define PRIxVADDR PRIxPTR
-#define PRIxVSIZE PRIxPTR
-#define PRIuVSIZE PRIuPTR
+#define PRIxPADDR PRIxPTR
+#define PRIxPSIZE PRIxPTR
+#define PRIuPSIZE PRIuPTR
+#define PRIxVADDR PRIxPTR
+#define PRIxVSIZE PRIxPTR
+#define PRIuVSIZE PRIuPTR
#ifdef _LP64 // match <riscv/reg.h>
-#define PRIxREGISTER PRIx64
+#define PRIxREGISTER PRIx64
typedef __int64_t register_t;
typedef __uint64_t uregister_t;
#else
-#define PRIxREGISTER PRIx32
+#define PRIxREGISTER PRIx32
typedef __int32_t register_t;
typedef __uint32_t uregister_t;
#endif
typedef signed int register32_t;
typedef unsigned int uregister32_t;
-#define PRIxREGISTER32 "x"
+#define PRIxREGISTER32 "x"
typedef unsigned short tlb_asid_t;
#endif
@@ -78,33 +78,33 @@ typedef __int64_t __register_t;
typedef __int32_t __register_t;
#endif
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
+#define __SIMPLELOCK_LOCKED 1
+#define __SIMPLELOCK_UNLOCKED 0
-#define __HAVE_FAST_SOFTINTS
-#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#define __HAVE_CPU_COUNTER
-#define __HAVE_SYSCALL_INTERN
-#define __HAVE_CPU_DATA_FIRST
-#define __HAVE___LWP_GETPRIVATE_FAST
-#define __HAVE_COMMON___TLS_GET_ADDR
-#define __HAVE_TLS_VARIANT_I
+#define __HAVE_FAST_SOFTINTS
+#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+#define __HAVE_CPU_COUNTER
+#define __HAVE_SYSCALL_INTERN
+#define __HAVE_CPU_DATA_FIRST
+#define __HAVE___LWP_GETPRIVATE_FAST
+#define __HAVE_COMMON___TLS_GET_ADDR
+#define __HAVE_TLS_VARIANT_I
#ifdef __LP64
-#define __HAVE_ATOMIC64_OPS
-#define __HAVE_CPU_UAREA_ROUTINES
+#define __HAVE_ATOMIC64_OPS
+#define __HAVE_CPU_UAREA_ROUTINES
#endif
-//#define __HAVE_NEW_STYLE_BUS_H
-#define __HAVE_NO_BUS_DMA
+//#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NO_BUS_DMA
#define __HAVE_COMPAT_NETBSD32
//#if defined(_KERNEL)
-//#define __HAVE_RAS
+//#define __HAVE_RAS
//#endif
#if defined(_KERNEL) || defined(_KMEMUSER)
-#define PCU_FPU 0
-#define PCU_UNIT_COUNT 1
+#define PCU_FPU 0
+#define PCU_UNIT_COUNT 1
#endif
/* XXX temporary */
Index: src/sys/arch/rs6000/include/types.h
diff -u src/sys/arch/rs6000/include/types.h:1.3 src/sys/arch/rs6000/include/types.h:1.4
--- src/sys/arch/rs6000/include/types.h:1.3 Sat Jul 17 15:25:57 2010
+++ src/sys/arch/rs6000/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: types.h,v 1.3 2010/07/17 15:25:57 tsutsui Exp $ */
+/* $NetBSD: types.h,v 1.4 2021/04/01 04:35:47 simonb Exp $ */
#define __HAVE_NWSCONS
-#define __HAVE_DEVICE_REGISTER
-/*#define PMAP_NEED_MAPKERNEL*/
+#define __HAVE_DEVICE_REGISTER
+/*#define PMAP_NEED_MAPKERNEL*/
#include <powerpc/types.h>
Index: src/sys/arch/sandpoint/include/types.h
diff -u src/sys/arch/sandpoint/include/types.h:1.8 src/sys/arch/sandpoint/include/types.h:1.9
--- src/sys/arch/sandpoint/include/types.h:1.8 Sun Jul 17 23:27:02 2011
+++ src/sys/arch/sandpoint/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: types.h,v 1.8 2011/07/17 23:27:02 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.9 2021/04/01 04:35:47 simonb Exp $ */
-#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_NEW_STYLE_BUS_H
#include <powerpc/types.h>
Index: src/sys/arch/sgimips/include/types.h
diff -u src/sys/arch/sgimips/include/types.h:1.17 src/sys/arch/sgimips/include/types.h:1.18
--- src/sys/arch/sgimips/include/types.h:1.17 Thu Jan 26 15:55:10 2017
+++ src/sys/arch/sgimips/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,9 +1,9 @@
-/* $NetBSD: types.h,v 1.17 2017/01/26 15:55:10 christos Exp $ */
+/* $NetBSD: types.h,v 1.18 2021/04/01 04:35:47 simonb Exp $ */
#ifndef _SGIMIPS_TYPES_H_
#define _SGIMIPS_TYPES_H_
-#define _MIPS_PADDR_T_64BIT
+#define _MIPS_PADDR_T_64BIT
#include <mips/types.h>
Index: src/sys/arch/sun2/include/types.h
diff -u src/sys/arch/sun2/include/types.h:1.12 src/sys/arch/sun2/include/types.h:1.13
--- src/sys/arch/sun2/include/types.h:1.12 Tue May 8 19:35:17 2018
+++ src/sys/arch/sun2/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.12 2018/05/08 19:35:17 christos Exp $ */
+/* $NetBSD: types.h,v 1.13 2021/04/01 04:35:47 simonb Exp $ */
#include <m68k/types.h>
#define __HAVE_MM_MD_KERNACC
@@ -6,4 +6,4 @@
#define __HAVE_MM_MD_READWRITE
#define __HAVE_MM_MD_MMAP
#define __HAVE_NO___THREAD
-#define __HAVE_NO_PMAP_STATS
+#define __HAVE_NO_PMAP_STATS
Index: src/sys/arch/sun3/include/types.h
diff -u src/sys/arch/sun3/include/types.h:1.20 src/sys/arch/sun3/include/types.h:1.21
--- src/sys/arch/sun3/include/types.h:1.20 Tue May 8 19:35:17 2018
+++ src/sys/arch/sun3/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.20 2018/05/08 19:35:17 christos Exp $ */
+/* $NetBSD: types.h,v 1.21 2021/04/01 04:35:47 simonb Exp $ */
#include <m68k/types.h>
@@ -6,4 +6,4 @@
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_MM_MD_MMAP
#define __HAVE_MM_MD_READWRITE
-#define __HAVE_NO_PMAP_STATS
+#define __HAVE_NO_PMAP_STATS
Index: src/sys/arch/usermode/include/types.h
diff -u src/sys/arch/usermode/include/types.h:1.16 src/sys/arch/usermode/include/types.h:1.17
--- src/sys/arch/usermode/include/types.h:1.16 Wed Apr 10 04:10:53 2019
+++ src/sys/arch/usermode/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.16 2019/04/10 04:10:53 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.17 2021/04/01 04:35:47 simonb Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#ifndef _USERMODE_TYPES_H_
-#define _USERMODE_TYPES_H_
+#define _USERMODE_TYPES_H_
#include <sys/cdefs.h>
#include <sys/featuretest.h>
@@ -81,18 +81,18 @@ typedef __vaddr_t vaddr_t;
typedef unsigned char __cpu_simple_lock_nv_t;
typedef register_t __register_t;
-#define __CPU_SIMPLE_LOCK_PAD
+#define __CPU_SIMPLE_LOCK_PAD
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
+#define __SIMPLELOCK_LOCKED 1
+#define __SIMPLELOCK_UNLOCKED 0
#if defined(__i386__)
-#define __HAVE_OLD_DISKLABEL
+#define __HAVE_OLD_DISKLABEL
#endif
-#define __HAVE_CPU_DATA_FIRST
-#define __HAVE_CPU_LWP_SETPRIVATE
-#define __HAVE_MM_MD_KERNACC
+#define __HAVE_CPU_DATA_FIRST
+#define __HAVE_CPU_LWP_SETPRIVATE
+#define __HAVE_MM_MD_KERNACC
#define __HAVE_COMPAT_NETBSD32
#endif /* !_USERMODE_TYPES_H_ */
Index: src/sys/arch/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.50 src/sys/arch/vax/include/types.h:1.51
--- src/sys/arch/vax/include/types.h:1.50 Sat Jan 23 22:31:20 2016
+++ src/sys/arch/vax/include/types.h Thu Apr 1 04:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.50 2016/01/23 22:31:20 christos Exp $ */
+/* $NetBSD: types.h,v 1.51 2021/04/01 04:35:47 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -66,8 +66,8 @@ typedef int register_t;
typedef char __cpu_simple_lock_nv_t;
typedef int __register_t;
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
+#define __SIMPLELOCK_LOCKED 1
+#define __SIMPLELOCK_UNLOCKED 0
/* The VAX does not have strict alignment requirements. */
#define __NO_STRICT_ALIGNMENT
