Thu Jul 30 06:54:07 2020 UTC ()
Sort the #define __HAVEs. NFCI.


(skrll)
diff -r1.70 -r1.71 src/sys/arch/mips/include/types.h
cvs diff -r1.70 -r1.71 src/sys/arch/mips/include/types.h (expand / switch to unified diff)

--- src/sys/arch/mips/include/types.h 2020/04/30 20:48:10 1.70
+++ src/sys/arch/mips/include/types.h 2020/07/30 06:54:07 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: types.h,v 1.70 2020/04/30 20:48:10 skrll Exp $ */ 1/* $NetBSD: types.h,v 1.71 2020/07/30 06:54:07 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1992, 1993 4 * Copyright (c) 1992, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Ralph Campbell. 8 * Ralph Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -132,50 +132,48 @@ typedef struct label_t { @@ -132,50 +132,48 @@ typedef struct label_t {
132#define _L_S8 11 132#define _L_S8 11
133#define _L_RA 12 133#define _L_RA 12
134#define _L_SR 13 134#define _L_SR 13
135 135
136typedef __uint32_t tlb_asid_t; 136typedef __uint32_t tlb_asid_t;
137#endif /* _KERNEL */ 137#endif /* _KERNEL */
138 138
139#if defined(_KERNEL) || defined(_KMEMUSER) 139#if defined(_KERNEL) || defined(_KMEMUSER)
140#define PCU_FPU 0 140#define PCU_FPU 0
141#define PCU_DSP 1 141#define PCU_DSP 1
142#define PCU_UNIT_COUNT 2 142#define PCU_UNIT_COUNT 2
143#endif 143#endif
144 144
145 
146#define __SIMPLELOCK_LOCKED 1 145#define __SIMPLELOCK_LOCKED 1
147#define __SIMPLELOCK_UNLOCKED 0 146#define __SIMPLELOCK_UNLOCKED 0
148 147
149#define __HAVE_FAST_SOFTINTS 148#define __HAVE_COMMON___TLS_GET_ADDR
150#define __HAVE_SYSCALL_INTERN 
151#define __HAVE_CPU_LWP_SETPRIVATE 
152#define __HAVE_CPU_DATA_FIRST 
153#define __HAVE_MD_CPU_OFFLINE 
154#define __HAVE_CPU_COUNTER 149#define __HAVE_CPU_COUNTER
 150#define __HAVE_CPU_DATA_FIRST
 151#define __HAVE_CPU_LWP_SETPRIVATE
155#define __HAVE_CPU_UAREA_ROUTINES 152#define __HAVE_CPU_UAREA_ROUTINES
156#define __HAVE_COMMON___TLS_GET_ADDR 153#define __HAVE_FAST_SOFTINTS
 154#define __HAVE_MD_CPU_OFFLINE
 155#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 156#define __HAVE_MM_MD_KERNACC
 157#define __HAVE_MM_MD_CACHE_ALIASING
 158#define __HAVE_SYSCALL_INTERN
 159#define __HAVE_TLS_VARIANT_I
 160#define __HAVE_UCAS_FULL
157#define __HAVE___LWP_GETTCB_FAST 161#define __HAVE___LWP_GETTCB_FAST
158#define __HAVE___LWP_SETTCB 162#define __HAVE___LWP_SETTCB
159#define __HAVE_TLS_VARIANT_I 163
 164/* XXX temporary */
 165#define __HAVE_UNLOCKED_PMAP
160 166
161#if !defined(__mips_o32) 167#if !defined(__mips_o32)
162#define __HAVE_ATOMIC64_OPS 168#define __HAVE_ATOMIC64_OPS
163#endif 169#endif
164 170
165#define __HAVE_UCAS_FULL 
166 
167#if defined(_KERNEL) 171#if defined(_KERNEL)
168#define __HAVE_RAS 172#define __HAVE_RAS
169#if defined(_LP64) 173#if defined(_LP64)
170#define __HAVE_CPU_VMSPACE_EXEC 174#define __HAVE_CPU_VMSPACE_EXEC
171#endif 175#endif
172#endif /* _KERNEL */ 176#endif /* _KERNEL */
173 177
174#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS 
175#define __HAVE_MM_MD_KERNACC 
176#define __HAVE_MM_MD_CACHE_ALIASING 
177 
178/* XXX temporary */ 
179#define __HAVE_UNLOCKED_PMAP 
180 178
181#endif /* _MIPS_TYPES_H_ */ 179#endif /* _MIPS_TYPES_H_ */