From 034e13e3b507d50b7c6f7f2406a2cf4fe95d948e Mon Sep 17 00:00:00 2001 From: skrll Date: Mon, 3 May 2021 20:07:57 +0000 Subject: [PATCH] Sort __HAVE_ #defines. NFCI. --- sys/arch/riscv/include/types.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/arch/riscv/include/types.h b/sys/arch/riscv/include/types.h index 25fca2fbc045..b1f3109b0631 100644 --- a/sys/arch/riscv/include/types.h +++ b/sys/arch/riscv/include/types.h @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.11 2021/05/01 06:45:23 skrll Exp $ */ +/* $NetBSD: types.h,v 1.12 2021/05/03 20:07:57 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -83,23 +83,25 @@ typedef __int32_t __register_t; #define __SIMPLELOCK_LOCKED 1 #define __SIMPLELOCK_UNLOCKED 0 +#define __HAVE_COMMON___TLS_GET_ADDR +#define __HAVE_COMPAT_NETBSD32 +#define __HAVE_CPU_COUNTER +#define __HAVE_CPU_DATA_FIRST #define __HAVE_FAST_SOFTINTS #define __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define __HAVE_CPU_COUNTER +//#define __HAVE_NEW_STYLE_BUS_H +#define __HAVE_NO_BUS_DMA #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 +/* XXX temporary */ +#define __HAVE_UNLOCKED_PMAP +#define __HAVE___LWP_GETPRIVATE_FAST + #ifdef __LP64 #define __HAVE_ATOMIC64_OPS #define __HAVE_CPU_UAREA_ROUTINES #endif -//#define __HAVE_NEW_STYLE_BUS_H -#define __HAVE_NO_BUS_DMA -#define __HAVE_COMPAT_NETBSD32 - //#if defined(_KERNEL) //#define __HAVE_RAS //#endif @@ -109,7 +111,4 @@ typedef __int32_t __register_t; #define PCU_UNIT_COUNT 1 #endif -/* XXX temporary */ -#define __HAVE_UNLOCKED_PMAP - #endif /* _RISCV_TYPES_H_ */