From 3904a21c363be4a107ac68b568e14ca0f40576bf Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 10 Jan 2025 22:02:52 +0000 Subject: [PATCH 1/9] Don't rely on sys/_types.h including sys/cdefs.h These headers relied in __BEGIN_DECS/__END_DECLS being defined when sys/_types.h was included, but there's not a requirement that this be the case. --- include/dlfcn.h | 1 + lib/msun/src/math.h | 1 + sys/sys/procdesc.h | 1 + 3 files changed, 3 insertions(+) diff --git a/include/dlfcn.h b/include/dlfcn.h index 89ec43b332e957..9a4ac0faf78661 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -32,6 +32,7 @@ #ifndef _DLFCN_H_ #define _DLFCN_H_ +#include #include /* diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index be7b86144738ad..aecc652ea08a1e 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -15,6 +15,7 @@ #ifndef _MATH_H_ #define _MATH_H_ +#include #include #include diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index ca26d65d5417d1..fce1ed78c23834 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -106,6 +106,7 @@ int procdesc_falloc(struct thread *, struct file **, int *, int, #else /* !_KERNEL */ +#include #include #ifndef _PID_T_DECLARED From e6eaa054dd5f7a6027a422f68c60cb067d3ac813 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 10 Jan 2025 22:04:51 +0000 Subject: [PATCH 2/9] sys/_types.h: use builtins to for __max_align_t Use __attribute__((__aligned__(x))) and __alignof__(x) in places of local macros that ultimately wrap these. We don't actually support compilers that don't define these so there's no loss of generality. This mirrors Clang's stddef.h. --- sys/sys/_types.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index c84b84edd2b87c..f6d1f26551e0fc 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -181,9 +181,11 @@ typedef __uint_least32_t __char32_t; #endif typedef struct { - long long __max_align1 __aligned(_Alignof(long long)); + long long __max_align1 + __attribute__((__aligned__(__alignof__(long long)))); #ifndef _STANDALONE - long double __max_align2 __aligned(_Alignof(long double)); + long double __max_align2 + __attribute__((__aligned__(__alignof__(long long)))); #endif } __max_align_t; From 02a28519d4a13c84f1a9696be21ba78bf7f95dff Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 10 Jan 2025 22:09:08 +0000 Subject: [PATCH 3/9] sys/_types.h: drop sys/cdefs.h include We no longer use it and it pollutes downstream headers. --- sys/sys/_types.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index f6d1f26551e0fc..fe345b43d5ebcf 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -29,8 +29,6 @@ #ifndef _SYS__TYPES_H_ #define _SYS__TYPES_H_ -#include - /* * Basic types upon which most other types are built. * From 568e83bd8f97d347365da8e689ae13eaadd1d1fa Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Sat, 11 Jan 2025 01:01:24 +0000 Subject: [PATCH 4/9] sys/cdefs.h: extract __*_VISIBLE to sys/_visible.h Some headers need to support our non-portable visibility macros, but would be more portable if they provided less overall pollution (e.g., stddef.h provides __BEGIN_DECLS/__END_DECLS). --- sys/sys/_visible.h | 223 +++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 185 +------------------------------------ 2 files changed, 224 insertions(+), 184 deletions(-) create mode 100644 sys/sys/_visible.h diff --git a/sys/sys/_visible.h b/sys/sys/_visible.h new file mode 100644 index 00000000000000..de7542db27b50b --- /dev/null +++ b/sys/sys/_visible.h @@ -0,0 +1,223 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * 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. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 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. + */ + +#ifndef _SYS__VISIBLE_H_ +#define _SYS__VISIBLE_H_ + +/*- + * The following definitions are an extension of the behavior originally + * implemented in , but with a different level of granularity. + * POSIX.1 requires that the macros we test be defined before any standard + * header file is included. + * + * Here's a quick run-down of the versions (and some informal names) + * defined(_POSIX_SOURCE) 1003.1-1988 + * encoded as 198808 below + * _POSIX_C_SOURCE == 1 1003.1-1990 + * encoded as 199009 below + * _POSIX_C_SOURCE == 2 1003.2-1992 C Language Binding Option + * encoded as 199209 below + * _POSIX_C_SOURCE == 199309 1003.1b-1993 + * (1003.1 Issue 4, Single Unix Spec v1, Unix 93) + * _POSIX_C_SOURCE == 199506 1003.1c-1995, 1003.1i-1995, + * and the omnibus ISO/IEC 9945-1: 1996 + * (1003.1 Issue 5, Single Unix Spec v2, Unix 95) + * _POSIX_C_SOURCE == 200112 1003.1-2001 (1003.1 Issue 6, Unix 03) + * with _XOPEN_SOURCE=600 + * _POSIX_C_SOURCE == 200809 1003.1-2008 (1003.1 Issue 7) + * IEEE Std 1003.1-2017 (Rev of 1003.1-2008) is + * 1003.1-2008 with two TCs applied and + * _XOPEN_SOURCE=700 + * _POSIX_C_SOURCE == 202405 1003.1-2004 (1003.1 Issue 8), IEEE Std 1003.1-2024 + * with _XOPEN_SOURCE=800 + * + * In addition, the X/Open Portability Guide, which is now the Single UNIX + * Specification, defines a feature-test macro which indicates the version of + * that specification, and which subsumes _POSIX_C_SOURCE. + * + * Our macros begin with two underscores to avoid namespace screwage. + */ + +/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */ +#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1 +#undef _POSIX_C_SOURCE /* Probably illegal, but beyond caring now. */ +#define _POSIX_C_SOURCE 199009 +#endif + +/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */ +#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2 +#undef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 199209 +#endif + +/* + * Deal with various X/Open Portability Guides and Single UNIX Spec. We use the + * '- 0' construct so software that defines _XOPEN_SOURCE to nothing doesn't + * cause errors. X/Open CAE Specification, August 1994, System Interfaces and + * Headers, Issue 4, Version 2 section 2.2 states an empty definition means the + * same thing as _POSIX_C_SOURCE == 2. This broadly mirrors "System V Interface + * Definition, Fourth Edition", but earlier editions suggest some ambiguity. + * However, FreeBSD has histoically implemented this as a NOP, so we just + * document what it should be for now to not break ports gratuitously. + */ +#ifdef _XOPEN_SOURCE +#if _XOPEN_SOURCE - 0 >= 800 +#define __XSI_VISIBLE 800 +#undef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 202405 +#elif _XOPEN_SOURCE - 0 >= 700 +#define __XSI_VISIBLE 700 +#undef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 200809 +#elif _XOPEN_SOURCE - 0 >= 600 +#define __XSI_VISIBLE 600 +#undef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 200112 +#elif _XOPEN_SOURCE - 0 >= 500 +#define __XSI_VISIBLE 500 +#undef _POSIX_C_SOURCE +#define _POSIX_C_SOURCE 199506 +#else +/* #define _POSIX_C_SOURCE 199209 */ +#endif +#endif + +/* + * Deal with all versions of POSIX. The ordering relative to the tests above is + * important. + */ +#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE) +#define _POSIX_C_SOURCE 198808 +#endif +#ifdef _POSIX_C_SOURCE +#if _POSIX_C_SOURCE >= 202405 +#define __POSIX_VISIBLE 202405 +#define __ISO_C_VISIBLE 2017 +#elif _POSIX_C_SOURCE >= 200809 +#define __POSIX_VISIBLE 200809 +#define __ISO_C_VISIBLE 1999 +#elif _POSIX_C_SOURCE >= 200112 +#define __POSIX_VISIBLE 200112 +#define __ISO_C_VISIBLE 1999 +#elif _POSIX_C_SOURCE >= 199506 +#define __POSIX_VISIBLE 199506 +#define __ISO_C_VISIBLE 1990 +#elif _POSIX_C_SOURCE >= 199309 +#define __POSIX_VISIBLE 199309 +#define __ISO_C_VISIBLE 1990 +#elif _POSIX_C_SOURCE >= 199209 +#define __POSIX_VISIBLE 199209 +#define __ISO_C_VISIBLE 1990 +#elif _POSIX_C_SOURCE >= 199009 +#define __POSIX_VISIBLE 199009 +#define __ISO_C_VISIBLE 1990 +#else +#define __POSIX_VISIBLE 198808 +#define __ISO_C_VISIBLE 0 +#endif /* _POSIX_C_SOURCE */ + +/* + * When we've explicitly asked for a newer C version, make the C variable + * visible by default. Also honor the glibc _ISOC{11,23}_SOURCE macros + * extensions. Both glibc and OpenBSD do this, even when a more strict + * _POSIX_C_SOURCE has been requested, and it makes good sense (especially for + * pre POSIX 2024, since C11 is much nicer than the old C99 base). Continue the + * practice with C23, though don't do older standards. Also, GLIBC doesn't have + * a _ISOC17_SOURCE, so it's not implemented here. glibc has earlier ISOCxx defines, + * but we don't implement those as they are not relevant enough. + */ +#if _ISOC23_SOURCE || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) +#undef __ISO_C_VISIBLE +#define __ISO_C_VISIBLE 2023 +#elif _ISOC11_SOURCE || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) +#undef __ISO_C_VISIBLE +#define __ISO_C_VISIBLE 2011 +#endif +#else /* _POSIX_C_SOURCE */ +/*- + * Deal with _ANSI_SOURCE: + * If it is defined, and no other compilation environment is explicitly + * requested, then define our internal feature-test macros to zero. This + * makes no difference to the preprocessor (undefined symbols in preprocessing + * expressions are defined to have value zero), but makes it more convenient for + * a test program to print out the values. + * + * If a program mistakenly defines _ANSI_SOURCE and some other macro such as + * _POSIX_C_SOURCE, we will assume that it wants the broader compilation + * environment (and in fact we will never get here). + */ +#if defined(_ANSI_SOURCE) /* Hide almost everything. */ +#define __POSIX_VISIBLE 0 +#define __XSI_VISIBLE 0 +#define __BSD_VISIBLE 0 +#define __ISO_C_VISIBLE 1990 +#define __EXT1_VISIBLE 0 +#elif defined(_C99_SOURCE) /* Localism to specify strict C99 env. */ +#define __POSIX_VISIBLE 0 +#define __XSI_VISIBLE 0 +#define __BSD_VISIBLE 0 +#define __ISO_C_VISIBLE 1999 +#define __EXT1_VISIBLE 0 +#elif defined(_C11_SOURCE) /* Localism to specify strict C11 env. */ +#define __POSIX_VISIBLE 0 +#define __XSI_VISIBLE 0 +#define __BSD_VISIBLE 0 +#define __ISO_C_VISIBLE 2011 +#define __EXT1_VISIBLE 0 +#elif defined(_C23_SOURCE) /* Localism to specify strict C23 env. */ +#define __POSIX_VISIBLE 0 +#define __XSI_VISIBLE 0 +#define __BSD_VISIBLE 0 +#define __ISO_C_VISIBLE 2023 +#define __EXT1_VISIBLE 0 +#else /* Default environment: show everything. */ +#define __POSIX_VISIBLE 202405 +#define __XSI_VISIBLE 800 +#define __BSD_VISIBLE 1 +#define __ISO_C_VISIBLE 2023 +#define __EXT1_VISIBLE 1 +#endif +#endif /* _POSIX_C_SOURCE */ + +/* User override __EXT1_VISIBLE */ +#if defined(__STDC_WANT_LIB_EXT1__) +#undef __EXT1_VISIBLE +#if __STDC_WANT_LIB_EXT1__ +#define __EXT1_VISIBLE 1 +#else +#define __EXT1_VISIBLE 0 +#endif +#endif /* __STDC_WANT_LIB_EXT1__ */ + +#endif /* !_SYS__VISIBLE_H_ */ diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index c46be9f3584206..8c389f99cc95dd 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -468,190 +468,7 @@ #define __RENAME(x) no renaming in kernel/standalone environment #endif -/*- - * The following definitions are an extension of the behavior originally - * implemented in , but with a different level of granularity. - * POSIX.1 requires that the macros we test be defined before any standard - * header file is included. - * - * Here's a quick run-down of the versions (and some informal names) - * defined(_POSIX_SOURCE) 1003.1-1988 - * encoded as 198808 below - * _POSIX_C_SOURCE == 1 1003.1-1990 - * encoded as 199009 below - * _POSIX_C_SOURCE == 2 1003.2-1992 C Language Binding Option - * encoded as 199209 below - * _POSIX_C_SOURCE == 199309 1003.1b-1993 - * (1003.1 Issue 4, Single Unix Spec v1, Unix 93) - * _POSIX_C_SOURCE == 199506 1003.1c-1995, 1003.1i-1995, - * and the omnibus ISO/IEC 9945-1: 1996 - * (1003.1 Issue 5, Single Unix Spec v2, Unix 95) - * _POSIX_C_SOURCE == 200112 1003.1-2001 (1003.1 Issue 6, Unix 03) - * with _XOPEN_SOURCE=600 - * _POSIX_C_SOURCE == 200809 1003.1-2008 (1003.1 Issue 7) - * IEEE Std 1003.1-2017 (Rev of 1003.1-2008) is - * 1003.1-2008 with two TCs applied and - * _XOPEN_SOURCE=700 - * _POSIX_C_SOURCE == 202405 1003.1-2004 (1003.1 Issue 8), IEEE Std 1003.1-2024 - * with _XOPEN_SOURCE=800 - * - * In addition, the X/Open Portability Guide, which is now the Single UNIX - * Specification, defines a feature-test macro which indicates the version of - * that specification, and which subsumes _POSIX_C_SOURCE. - * - * Our macros begin with two underscores to avoid namespace screwage. - */ - -/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */ -#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1 -#undef _POSIX_C_SOURCE /* Probably illegal, but beyond caring now. */ -#define _POSIX_C_SOURCE 199009 -#endif - -/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */ -#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 199209 -#endif - -/* - * Deal with various X/Open Portability Guides and Single UNIX Spec. We use the - * '- 0' construct so software that defines _XOPEN_SOURCE to nothing doesn't - * cause errors. X/Open CAE Specification, August 1994, System Interfaces and - * Headers, Issue 4, Version 2 section 2.2 states an empty definition means the - * same thing as _POSIX_C_SOURCE == 2. This broadly mirrors "System V Interface - * Definition, Fourth Edition", but earlier editions suggest some ambiguity. - * However, FreeBSD has histoically implemented this as a NOP, so we just - * document what it should be for now to not break ports gratuitously. - */ -#ifdef _XOPEN_SOURCE -#if _XOPEN_SOURCE - 0 >= 800 -#define __XSI_VISIBLE 800 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 202405 -#elif _XOPEN_SOURCE - 0 >= 700 -#define __XSI_VISIBLE 700 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 200809 -#elif _XOPEN_SOURCE - 0 >= 600 -#define __XSI_VISIBLE 600 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 200112 -#elif _XOPEN_SOURCE - 0 >= 500 -#define __XSI_VISIBLE 500 -#undef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 199506 -#else -/* #define _POSIX_C_SOURCE 199209 */ -#endif -#endif - -/* - * Deal with all versions of POSIX. The ordering relative to the tests above is - * important. - */ -#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE) -#define _POSIX_C_SOURCE 198808 -#endif -#ifdef _POSIX_C_SOURCE -#if _POSIX_C_SOURCE >= 202405 -#define __POSIX_VISIBLE 202405 -#define __ISO_C_VISIBLE 2017 -#elif _POSIX_C_SOURCE >= 200809 -#define __POSIX_VISIBLE 200809 -#define __ISO_C_VISIBLE 1999 -#elif _POSIX_C_SOURCE >= 200112 -#define __POSIX_VISIBLE 200112 -#define __ISO_C_VISIBLE 1999 -#elif _POSIX_C_SOURCE >= 199506 -#define __POSIX_VISIBLE 199506 -#define __ISO_C_VISIBLE 1990 -#elif _POSIX_C_SOURCE >= 199309 -#define __POSIX_VISIBLE 199309 -#define __ISO_C_VISIBLE 1990 -#elif _POSIX_C_SOURCE >= 199209 -#define __POSIX_VISIBLE 199209 -#define __ISO_C_VISIBLE 1990 -#elif _POSIX_C_SOURCE >= 199009 -#define __POSIX_VISIBLE 199009 -#define __ISO_C_VISIBLE 1990 -#else -#define __POSIX_VISIBLE 198808 -#define __ISO_C_VISIBLE 0 -#endif /* _POSIX_C_SOURCE */ - -/* - * When we've explicitly asked for a newer C version, make the C variable - * visible by default. Also honor the glibc _ISOC{11,23}_SOURCE macros - * extensions. Both glibc and OpenBSD do this, even when a more strict - * _POSIX_C_SOURCE has been requested, and it makes good sense (especially for - * pre POSIX 2024, since C11 is much nicer than the old C99 base). Continue the - * practice with C23, though don't do older standards. Also, GLIBC doesn't have - * a _ISOC17_SOURCE, so it's not implemented here. glibc has earlier ISOCxx defines, - * but we don't implement those as they are not relevant enough. - */ -#if _ISOC23_SOURCE || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) -#undef __ISO_C_VISIBLE -#define __ISO_C_VISIBLE 2023 -#elif _ISOC11_SOURCE || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) -#undef __ISO_C_VISIBLE -#define __ISO_C_VISIBLE 2011 -#endif -#else /* _POSIX_C_SOURCE */ -/*- - * Deal with _ANSI_SOURCE: - * If it is defined, and no other compilation environment is explicitly - * requested, then define our internal feature-test macros to zero. This - * makes no difference to the preprocessor (undefined symbols in preprocessing - * expressions are defined to have value zero), but makes it more convenient for - * a test program to print out the values. - * - * If a program mistakenly defines _ANSI_SOURCE and some other macro such as - * _POSIX_C_SOURCE, we will assume that it wants the broader compilation - * environment (and in fact we will never get here). - */ -#if defined(_ANSI_SOURCE) /* Hide almost everything. */ -#define __POSIX_VISIBLE 0 -#define __XSI_VISIBLE 0 -#define __BSD_VISIBLE 0 -#define __ISO_C_VISIBLE 1990 -#define __EXT1_VISIBLE 0 -#elif defined(_C99_SOURCE) /* Localism to specify strict C99 env. */ -#define __POSIX_VISIBLE 0 -#define __XSI_VISIBLE 0 -#define __BSD_VISIBLE 0 -#define __ISO_C_VISIBLE 1999 -#define __EXT1_VISIBLE 0 -#elif defined(_C11_SOURCE) /* Localism to specify strict C11 env. */ -#define __POSIX_VISIBLE 0 -#define __XSI_VISIBLE 0 -#define __BSD_VISIBLE 0 -#define __ISO_C_VISIBLE 2011 -#define __EXT1_VISIBLE 0 -#elif defined(_C23_SOURCE) /* Localism to specify strict C23 env. */ -#define __POSIX_VISIBLE 0 -#define __XSI_VISIBLE 0 -#define __BSD_VISIBLE 0 -#define __ISO_C_VISIBLE 2023 -#define __EXT1_VISIBLE 0 -#else /* Default environment: show everything. */ -#define __POSIX_VISIBLE 202405 -#define __XSI_VISIBLE 800 -#define __BSD_VISIBLE 1 -#define __ISO_C_VISIBLE 2023 -#define __EXT1_VISIBLE 1 -#endif -#endif /* _POSIX_C_SOURCE */ - -/* User override __EXT1_VISIBLE */ -#if defined(__STDC_WANT_LIB_EXT1__) -#undef __EXT1_VISIBLE -#if __STDC_WANT_LIB_EXT1__ -#define __EXT1_VISIBLE 1 -#else -#define __EXT1_VISIBLE 0 -#endif -#endif /* __STDC_WANT_LIB_EXT1__ */ +#include /* * Nullability qualifiers: currently only supported by Clang. From 7febc2df6554e85e28013ae97871ec5eef24e36c Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 17 Jan 2025 16:31:26 +0000 Subject: [PATCH 5/9] stddef.h: don't include sys/cdefs.h Switch to sys/_visible.h for visibility macros. Prefer __builtin_offsetof over __offset. sys/cdefs.h always defines __offsetof to __builtin_offsetof so just use the latter to remove a dependency on sys/cdefs.h. Realistically, we're never going to care about a compiler that doesn't supply this builtin. Add a somewhat questionable guard around the offsetof() definition because the compiler no longer thinks it the same as a number of other redundent definitions scattered around (e.g., in the openzfs codebase). It is infact the same and those defintions likely shouldn't exist at all. --- include/stddef.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/stddef.h b/include/stddef.h index 2255ea47a49a30..3ba9a9946b01ba 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -32,9 +32,9 @@ #ifndef _STDDEF_H_ #define _STDDEF_H_ -#include #include #include +#include #ifndef _PTRDIFF_T_DECLARED typedef __ptrdiff_t ptrdiff_t; @@ -61,7 +61,9 @@ typedef __max_align_t max_align_t; #endif #endif -#define offsetof(type, field) __offsetof(type, field) +#ifndef offsetof +#define offsetof(type, field) __builtin_offsetof(type, field) +#endif #if __EXT1_VISIBLE /* ISO/IEC 9899:2011 K.3.3.2 */ From abcd8790d379b170b9cc62456640c6e5ce9be463 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 30 Jan 2025 01:13:33 +0000 Subject: [PATCH 6/9] sys/_stdarg.h: drop cdefs.h and _types.h polution Rely in sys/_visible for visibility macros and use __buitin_va_list instead of __va_list everywere we declare va_list. --- include/stdio.h | 2 +- include/wchar.h | 2 +- sys/sys/_stdarg.h | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index 3dedb8fd5a5430..34e877b60c1460 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -74,7 +74,7 @@ typedef __off64_t off64_t; #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE #ifndef _VA_LIST_DECLARED -typedef __va_list va_list; +typedef __builtin_va_list va_list; #define _VA_LIST_DECLARED #endif #endif diff --git a/include/wchar.h b/include/wchar.h index e4b037c9b16fd5..bf07062935d5e7 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -78,7 +78,7 @@ typedef __size_t size_t; #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE #ifndef _VA_LIST_DECLARED -typedef __va_list va_list; +typedef __builtin_va_list va_list; #define _VA_LIST_DECLARED #endif #endif diff --git a/sys/sys/_stdarg.h b/sys/sys/_stdarg.h index 063e59dc83f6f9..3886f4632b1092 100644 --- a/sys/sys/_stdarg.h +++ b/sys/sys/_stdarg.h @@ -31,12 +31,11 @@ #ifndef _SYS__STDARG_H_ #define _SYS__STDARG_H_ -#include -#include +#include #ifndef _VA_LIST_DECLARED - #define _VA_LIST_DECLARED - typedef __va_list va_list; +#define _VA_LIST_DECLARED +typedef __builtin_va_list va_list; #endif #define va_start(ap, last) __builtin_va_start((ap), (last)) From 53ead885610adbbc1182cffa0cd09c2b76f130ef Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 30 Jan 2025 04:41:39 +0000 Subject: [PATCH 7/9] Add sys/stdarg.h While the type of va_list and implementation of va_*() psuedo functions varies (sometimes greatly) by architecture, it will always be defind by the compiler in a consistant way that does not require machine dependent handling. MFC after: 1 week --- include/Makefile | 4 ++-- sys/sys/stdarg.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 sys/sys/stdarg.h diff --git a/include/Makefile b/include/Makefile index 16d641b42a908c..7dfdc652f452f5 100644 --- a/include/Makefile +++ b/include/Makefile @@ -38,9 +38,9 @@ INCS= a.out.h ar.h assert.h bitstring.h byteswap.h \ .PATH: ${SRCTOP}/contrib/libc-vis INCS+= vis.h -MHDRS= float.h floatingpoint.h stdarg.h +MHDRS= float.h floatingpoint.h -PHDRS= _semaphore.h +PHDRS= _semaphore.h stdarg.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ syslog.h ucontext.h diff --git a/sys/sys/stdarg.h b/sys/sys/stdarg.h new file mode 100644 index 00000000000000..d9266d12c7e119 --- /dev/null +++ b/sys/sys/stdarg.h @@ -0,0 +1,6 @@ +#ifndef __SYS_STDARG_H__ +#define __SYS_STDARG_H__ + +#include + +#endif /* __SYS_STDARG_H__ */ From 7121318319caa0c1371589b02cd2d38c9d61eafe Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 30 Jan 2025 04:39:19 +0000 Subject: [PATCH 8/9] machine/stdarg.h -> sys/stdarg.h Switch to using sys/stdarg.h for va_list type and va_* builtins. Make an attempt to insert the include in a sensible place. Where style(9) was followed this is easy, where it was ignored, aim for the first block of sys/*.h headers and don't get too fussy or try to fix other style bugs. --- share/man/man9/PCI_IOV_ADD_VF.9 | 2 +- share/man/man9/PCI_IOV_INIT.9 | 2 +- share/man/man9/pci_iov_schema.9 | 2 +- stand/common/dev_net.c | 3 ++- stand/common/md.c | 2 +- stand/efi/boot1/boot1.c | 4 +++- stand/efi/boot1/proto.c | 4 +++- stand/efi/gptboot/proto.c | 4 +++- stand/i386/libi386/biosacpi.c | 2 +- stand/i386/libi386/biospci.c | 2 +- stand/i386/libi386/biospnp.c | 2 +- stand/liblua/lstd.h | 2 +- stand/libofw/ofw_disk.c | 3 +-- stand/libofw/openfirm.c | 3 +-- stand/libsa/Makefile | 2 +- stand/libsa/panic.c | 2 +- stand/libsa/printf.c | 7 +------ stand/powerpc/boot1.chrp/boot1.c | 4 +++- stand/uboot/uboot_disk.c | 3 ++- sys/amd64/linux/linux_vdso_gtod.c | 2 +- sys/arm/ti/cpsw/if_cpsw.c | 2 +- sys/arm/xilinx/zy7_devcfg.c | 2 +- sys/arm/xilinx/zy7_ehci.c | 2 +- sys/arm/xilinx/zy7_gpio.c | 2 +- sys/arm/xilinx/zy7_qspi.c | 2 +- sys/arm/xilinx/zy7_slcr.c | 2 +- sys/arm/xilinx/zy7_spi.c | 2 +- sys/arm64/linux/linux_vdso_gtod.c | 2 +- sys/arm64/qoriq/qoriq_gpio_pic.c | 2 +- sys/cam/ata/ata_xpt.c | 2 +- sys/cam/cam_xpt.c | 2 +- sys/cam/ctl/ctl_error.c | 2 +- sys/cam/ctl/ctl_error.h | 2 +- sys/cam/mmc/mmc_xpt.c | 2 +- sys/cam/nvme/nvme_xpt.c | 2 +- sys/cam/scsi/scsi_all.h | 2 +- sys/cam/scsi/scsi_enc.c | 3 +-- sys/cam/scsi/scsi_xpt.c | 2 +- sys/cddl/compat/opensolaris/kern/opensolaris_string.c | 2 +- sys/cddl/compat/opensolaris/sys/cmn_err.h | 2 +- sys/cddl/compat/opensolaris/sys/varargs.h | 2 +- sys/cddl/dev/fbt/fbt.c | 2 +- sys/cddl/dev/profile/profile.c | 2 +- sys/cddl/dev/systrace/systrace.c | 3 +-- sys/compat/linux/linux_util.c | 3 +-- sys/compat/linuxkpi/common/include/linux/kmod.h | 2 +- sys/compat/linuxkpi/common/include/linux/kobject.h | 2 +- sys/compat/linuxkpi/common/include/linux/stdarg.h | 2 +- sys/compat/linuxkpi/common/include/stdarg.h | 2 +- sys/compat/linuxkpi/common/src/linux_compat.c | 3 +-- sys/compat/linuxkpi/common/src/linux_idr.c | 3 +-- sys/compat/linuxkpi/common/src/linux_pci.c | 2 +- sys/contrib/dev/acpica/include/platform/acfreebsd.h | 2 +- sys/contrib/libnv/bsd_nvpair.c | 3 +-- sys/contrib/libnv/cnvlist.c | 3 +-- sys/contrib/libnv/dnvlist.c | 3 +-- sys/contrib/libnv/nvlist.c | 3 +-- sys/contrib/ncsw/inc/stdarg_ext.h | 2 +- sys/contrib/ncsw/user/env/xx.c | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c | 2 +- sys/contrib/rdma/krping/krping_dev.c | 2 +- sys/contrib/vchiq/interface/compat/vchi_bsd.c | 3 +-- sys/ddb/db_output.c | 3 +-- sys/ddb/db_pprint.c | 3 +-- sys/dev/aacraid/aacraid_debug.c | 3 +-- sys/dev/ahci/ahci.c | 2 +- sys/dev/ahci/ahci_pci.c | 2 +- sys/dev/ahci/ahciem.c | 2 +- sys/dev/ata/ata-all.c | 2 +- sys/dev/ata/ata-isa.c | 2 +- sys/dev/ata/ata-pci.c | 5 ++++- sys/dev/ata/ata-sata.c | 2 +- sys/dev/ata/chipsets/ata-acard.c | 2 +- sys/dev/ata/chipsets/ata-acerlabs.c | 2 +- sys/dev/ata/chipsets/ata-amd.c | 2 +- sys/dev/ata/chipsets/ata-ati.c | 2 +- sys/dev/ata/chipsets/ata-cenatek.c | 2 +- sys/dev/ata/chipsets/ata-cypress.c | 2 +- sys/dev/ata/chipsets/ata-cyrix.c | 2 +- sys/dev/ata/chipsets/ata-highpoint.c | 2 +- sys/dev/ata/chipsets/ata-intel.c | 2 +- sys/dev/ata/chipsets/ata-ite.c | 2 +- sys/dev/ata/chipsets/ata-jmicron.c | 2 +- sys/dev/ata/chipsets/ata-marvell.c | 2 +- sys/dev/ata/chipsets/ata-micron.c | 2 +- sys/dev/ata/chipsets/ata-national.c | 2 +- sys/dev/ata/chipsets/ata-netcell.c | 2 +- sys/dev/ata/chipsets/ata-nvidia.c | 2 +- sys/dev/ata/chipsets/ata-promise.c | 2 +- sys/dev/ata/chipsets/ata-serverworks.c | 2 +- sys/dev/ata/chipsets/ata-siliconimage.c | 2 +- sys/dev/ata/chipsets/ata-sis.c | 2 +- sys/dev/ata/chipsets/ata-via.c | 2 +- sys/dev/ath/ah_osdep.c | 3 +-- sys/dev/bhnd/nvram/bhnd_nvram_private.h | 3 +-- sys/dev/bhnd/nvram/bhnd_nvram_value.h | 2 +- sys/dev/etherswitch/e6000sw/e6000sw.c | 2 +- sys/dev/fdc/fdc.c | 2 +- sys/dev/filemon/filemon_wrapper.c | 3 +-- sys/dev/gpio/qoriq_gpio.c | 2 +- sys/dev/hpt27xx/os_bsd.h | 2 +- sys/dev/hptiop/hptiop.c | 2 +- sys/dev/hptmv/hptproc.c | 2 +- sys/dev/hptnr/os_bsd.h | 2 +- sys/dev/hptrr/os_bsd.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 2 +- sys/dev/iavf/iavf_iflib.h | 2 +- sys/dev/iavf/iavf_lib.h | 2 +- sys/dev/iavf/iavf_osdep.c | 2 +- sys/dev/ice/ice_osdep.c | 2 +- sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 2 +- sys/dev/ioat/ioat.c | 2 +- sys/dev/ioat/ioat_test.c | 2 +- sys/dev/isci/isci_logger.c | 2 +- sys/dev/isp/isp_freebsd.h | 2 +- sys/dev/ixl/ixl.h | 2 +- sys/dev/mpi3mr/mpi3mr_cam.c | 3 +-- sys/dev/mpr/mpr_sas.c | 3 +-- sys/dev/mpr/mpr_sas_lsi.c | 3 +-- sys/dev/mps/mps_sas.c | 3 +-- sys/dev/mps/mps_sas_lsi.c | 3 +-- sys/dev/mpt/mpt_debug.c | 2 +- sys/dev/mpt/mpt_raid.c | 3 +-- sys/dev/mvs/mvs.c | 2 +- sys/dev/mvs/mvs_pci.c | 2 +- sys/dev/mvs/mvs_soc.c | 2 +- sys/dev/nvme/nvme_ctrlr.c | 2 +- sys/dev/nvmf/host/nvmf_ns.c | 2 +- sys/dev/ocs_fc/ocs_os.h | 2 +- sys/dev/ofw/ofw_fdt.c | 3 +-- sys/dev/ofw/ofw_standard.c | 3 +-- sys/dev/ofw/openfirm.c | 3 +-- sys/dev/pci/pci.c | 2 +- sys/dev/pci/pci_iov.c | 2 +- sys/dev/pci/pci_iov_schema.c | 3 +-- sys/dev/ppbus/ppb_msq.c | 2 +- sys/dev/proto/proto_core.c | 2 +- sys/dev/pst/pst-iop.c | 2 +- sys/dev/pst/pst-pci.c | 2 +- sys/dev/pst/pst-raid.c | 2 +- sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c | 2 +- sys/dev/random/fenestrasX/fx_rng.c | 2 +- sys/dev/rndtest/rndtest.c | 2 +- sys/dev/sdhci/sdhci.c | 2 +- sys/dev/siis/siis.c | 2 +- sys/dev/superio/superio.c | 2 +- sys/dev/syscons/syscons.c | 2 +- sys/dev/uart/uart_core.c | 2 +- sys/dev/uart/uart_tty.c | 2 +- sys/dev/usb/usb_dev.c | 3 +-- sys/dev/virtio/scsi/virtio_scsi.c | 3 +-- sys/dev/xen/bus/xen_intr.c | 2 +- sys/dev/xen/console/xen_console.c | 3 +-- sys/dev/xen/xenpci/xenpci.c | 3 +-- sys/dev/xen/xenstore/xenstore.c | 3 +-- sys/fs/nfsclient/nfs_clsubs.c | 7 +------ sys/fs/p9fs/p9_client.h | 2 +- sys/geom/geom_ctl.c | 3 +-- sys/geom/geom_dev.c | 2 +- sys/geom/geom_dump.c | 2 +- sys/geom/geom_event.c | 3 +-- sys/geom/geom_io.c | 2 +- sys/geom/geom_slice.c | 2 +- sys/geom/geom_subr.c | 2 +- sys/i386/i386/bios.c | 2 +- sys/i386/linux/linux_vdso_gtod.c | 2 +- sys/isa/pnpparse.c | 3 +-- sys/kern/kern_boottrace.c | 3 +-- sys/kern/kern_conf.c | 2 +- sys/kern/kern_devctl.c | 2 +- sys/kern/kern_fail.c | 2 +- sys/kern/kern_intr.c | 2 +- sys/kern/kern_kthread.c | 3 +-- sys/kern/kern_shutdown.c | 7 +------ sys/kern/kern_ubsan.c | 2 +- sys/kern/subr_bus.c | 2 +- sys/kern/subr_capability.c | 2 +- sys/kern/subr_epoch.c | 2 +- sys/kern/subr_gtaskqueue.c | 2 +- sys/kern/subr_intr.c | 2 +- sys/kern/subr_msan.c | 2 +- sys/kern/subr_prf.c | 6 +----- sys/kern/subr_sbuf.c | 2 +- sys/kern/subr_scanf.c | 7 +------ sys/kern/subr_taskqueue.c | 2 +- sys/kern/subr_terminal.c | 3 +-- sys/kern/subr_witness.c | 3 +-- sys/kern/tty.c | 3 +-- sys/kern/tty_pts.c | 3 +-- sys/kern/vfs_mount.c | 3 +-- sys/kern/vfs_subr.c | 3 +-- sys/kern/vfs_syscalls.c | 3 +-- sys/libkern/asprintf.c | 3 +-- sys/net/ieee8023ad_lacp.c | 2 +- sys/net/if.c | 2 +- sys/net/if_stf.c | 3 +-- sys/net/route/fib_algo.c | 3 +-- sys/net/vnet.c | 3 +-- sys/net80211/ieee80211.c | 3 +-- sys/net80211/ieee80211_input.c | 2 +- sys/netgraph/ng_parse.c | 3 +-- sys/netinet/libalias/alias_db.c | 2 +- sys/netinet/libalias/alias_sctp.c | 2 +- sys/netinet/raw_ip.c | 2 +- sys/netinet6/raw_ip6.c | 3 +-- sys/netipsec/ipsec_input.c | 2 +- sys/netipsec/ipsec_offload.c | 3 +-- sys/netipsec/key.c | 2 +- sys/netipsec/keysock.c | 3 +-- sys/netlink/netlink_message_parser.c | 3 +-- sys/powerpc/mpc85xx/mpc85xx_gpio.c | 2 +- sys/powerpc/ofw/ofw_real.c | 2 +- sys/powerpc/ofw/rtas.c | 2 +- sys/powerpc/powermac/ata_dbdma.c | 2 +- sys/powerpc/powermac/ata_kauai.c | 2 +- sys/powerpc/powermac/ata_macio.c | 2 +- sys/powerpc/psim/ata_iobus.c | 2 +- sys/rpc/rpcsec_gss/rpcsec_gss_prot.c | 2 +- sys/security/audit/audit_worker.c | 3 +-- sys/security/mac_do/mac_do.c | 3 +-- sys/tests/ktest.c | 2 +- sys/x86/x86/ucode.c | 2 +- sys/xen/xenbus/xenbus.c | 3 +-- sys/xen/xenbus/xenbusb.c | 3 +-- sys/xen/xenbus/xenbusb_back.c | 3 +-- sys/xen/xenbus/xenbusb_front.c | 3 +-- sys/xen/xenbus/xenbusvar.h | 3 +-- sys/xen/xenstore/xenstorevar.h | 3 +-- tools/tools/vhba/vhba.h | 2 +- tools/uma/smrstress/smrstress.c | 3 +-- 230 files changed, 243 insertions(+), 318 deletions(-) diff --git a/share/man/man9/PCI_IOV_ADD_VF.9 b/share/man/man9/PCI_IOV_ADD_VF.9 index d13cb6e1ddc9f3..512b0b8668cc18 100644 --- a/share/man/man9/PCI_IOV_ADD_VF.9 +++ b/share/man/man9/PCI_IOV_ADD_VF.9 @@ -31,7 +31,7 @@ .Nd inform a PF driver that a VF is being created .Sh SYNOPSIS .In sys/bus.h -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In dev/pci/pci_iov.h .Ft int diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9 index 66b1e693cedb77..8ce94800f6d1f0 100644 --- a/share/man/man9/PCI_IOV_INIT.9 +++ b/share/man/man9/PCI_IOV_INIT.9 @@ -31,7 +31,7 @@ .Nd enable SR-IOV on a PF device .Sh SYNOPSIS .In sys/bus.h -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In dev/pci/pci_iov.h .Ft int diff --git a/share/man/man9/pci_iov_schema.9 b/share/man/man9/pci_iov_schema.9 index 764d357fbaee18..99589b59fb911e 100644 --- a/share/man/man9/pci_iov_schema.9 +++ b/share/man/man9/pci_iov_schema.9 @@ -38,7 +38,7 @@ .Nm pci_iov_schema_add_unicast_mac .Nd PCI SR-IOV config schema interface .Sh SYNOPSIS -.In machine/stdarg.h +.In sys/stdarg.h .In sys/nv.h .In sys/iov_schema.h .Ft nvlist_t * diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index 3cd78c5346ac10..fc6b43ec7a4088 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -47,9 +47,10 @@ * for use by the NFS open code (NFS/lookup). */ -#include #include #include +#include + #include #include #include diff --git a/stand/common/md.c b/stand/common/md.c index d12429c3c45c83..2c3eb5ded19b42 100644 --- a/stand/common/md.c +++ b/stand/common/md.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "bootstrap.h" diff --git a/stand/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c index 908baf40097217..b93c6b425160bc 100644 --- a/stand/efi/boot1/boot1.c +++ b/stand/efi/boot1/boot1.c @@ -20,8 +20,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/efi/boot1/proto.c b/stand/efi/boot1/proto.c index 6660d39a921b88..f81debd168b9c6 100644 --- a/stand/efi/boot1/proto.c +++ b/stand/efi/boot1/proto.c @@ -20,8 +20,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/efi/gptboot/proto.c b/stand/efi/gptboot/proto.c index e2face6c23e516..a1825d9c1c1561 100644 --- a/stand/efi/gptboot/proto.c +++ b/stand/efi/gptboot/proto.c @@ -24,8 +24,10 @@ */ #include +#include + #include -#include + #include #include diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c index 077b6c7e53de66..8ddd322b9f9955 100644 --- a/stand/i386/libi386/biosacpi.c +++ b/stand/i386/libi386/biosacpi.c @@ -25,7 +25,7 @@ */ #include -#include +#include #include #include #include "libi386.h" diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c index 5b39eab1e5e5fa..a89a6d30a1e861 100644 --- a/stand/i386/libi386/biospci.c +++ b/stand/i386/libi386/biospci.c @@ -31,7 +31,7 @@ */ #include -#include +#include #include #include #include diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c index 5b22f066d4ef7a..c01d2888a9f71f 100644 --- a/stand/i386/libi386/biospnp.c +++ b/stand/i386/libi386/biospnp.c @@ -29,7 +29,7 @@ */ #include -#include +#include #include #include #include diff --git a/stand/liblua/lstd.h b/stand/liblua/lstd.h index ce3aef4bc5fc65..2b601f12956671 100644 --- a/stand/liblua/lstd.h +++ b/stand/liblua/lstd.h @@ -29,10 +29,10 @@ #include #include +#include #include #include #include -#include /* * Mini stdio FILE and DIR routines. These are the minimal routines needed by diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index fc4c25bd9424e6..d4bce64d9be5b4 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -28,11 +28,10 @@ */ #include +#include #include -#include - #include #include diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c index 58e7d8cbe7556b..1df65784e47adb 100644 --- a/stand/libofw/openfirm.c +++ b/stand/libofw/openfirm.c @@ -56,8 +56,7 @@ */ #include - -#include +#include #include diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 42ef3e69c18a6a..f5a1acea843e0d 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -209,8 +209,8 @@ beforedepend: for i in ${SAFE_INCS}; do \ ln -sf ${SRCTOP}/include/$$i $$i; \ done; \ - ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ ln -sf ${SYSDIR}/sys/errno.h errno.h; \ + ln -sf ${SYSDIR}/sys/stdarg.h stdarg.h; \ ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ diff --git a/stand/libsa/panic.c b/stand/libsa/panic.c index 319f08094d9216..a555743f04146a 100644 --- a/stand/libsa/panic.c +++ b/stand/libsa/panic.c @@ -34,7 +34,7 @@ */ #include -#include +#include /* * Boot loaders and other standalone programs that wish to have a diff --git a/stand/libsa/printf.c b/stand/libsa/printf.c index a84c5431f5369c..053b54d31effca 100644 --- a/stand/libsa/printf.c +++ b/stand/libsa/printf.c @@ -37,18 +37,13 @@ */ #include +#include #include #include #include #include #include "stand.h" -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) typedef void (kvprintf_fn_t)(int, void *); diff --git a/stand/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c index cdacb05c31ce42..1a546f3473e2bc 100644 --- a/stand/powerpc/boot1.chrp/boot1.c +++ b/stand/powerpc/boot1.chrp/boot1.c @@ -18,9 +18,11 @@ #include #include #include +#include + #include -#include #include + #include #include "paths.h" diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c index 4f7b6ba0694202..1f75f0f6da3c96 100644 --- a/stand/uboot/uboot_disk.c +++ b/stand/uboot/uboot_disk.c @@ -33,7 +33,8 @@ #include #include -#include +#include + #include #include "api_public.h" diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 519ca2f2de9349..abe42d51a3ac86 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c index ea8f9c18490e0a..dc3d8b1f902334 100644 --- a/sys/arm/ti/cpsw/if_cpsw.c +++ b/sys/arm/ti/cpsw/if_cpsw.c @@ -59,11 +59,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_devcfg.c b/sys/arm/xilinx/zy7_devcfg.c index 6df0fba1f56a94..41618225a56634 100644 --- a/sys/arm/xilinx/zy7_devcfg.c +++ b/sys/arm/xilinx/zy7_devcfg.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -49,7 +50,6 @@ #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_ehci.c b/sys/arm/xilinx/zy7_ehci.c index 545e2a9bce1683..6d84ec751e081d 100644 --- a/sys/arm/xilinx/zy7_ehci.c +++ b/sys/arm/xilinx/zy7_ehci.c @@ -45,10 +45,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c index 091237014c6f33..71b6fc3c0586f4 100644 --- a/sys/arm/xilinx/zy7_gpio.c +++ b/sys/arm/xilinx/zy7_gpio.c @@ -53,11 +53,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_qspi.c b/sys/arm/xilinx/zy7_qspi.c index 49d4cafd8d614e..42091bc786193e 100644 --- a/sys/arm/xilinx/zy7_qspi.c +++ b/sys/arm/xilinx/zy7_qspi.c @@ -42,11 +42,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c index a46ccb59a07b94..40bcff49162b38 100644 --- a/sys/arm/xilinx/zy7_slcr.c +++ b/sys/arm/xilinx/zy7_slcr.c @@ -42,12 +42,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/arm/xilinx/zy7_spi.c b/sys/arm/xilinx/zy7_spi.c index bb5bb7f4676707..636a40d729d663 100644 --- a/sys/arm/xilinx/zy7_spi.c +++ b/sys/arm/xilinx/zy7_spi.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index f7def68d88c462..203c76b6e3a9b6 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/arm64/qoriq/qoriq_gpio_pic.c b/sys/arm64/qoriq/qoriq_gpio_pic.c index ec84d2a14ae7ae..aca8b9daea138d 100644 --- a/sys/arm64/qoriq/qoriq_gpio_pic.c +++ b/sys/arm64/qoriq/qoriq_gpio_pic.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 61cffeda6f0cb8..e33e1fafa27412 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,6 @@ #include #include #include -#include /* for xpt_print below */ struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 8428125d5e99d8..38bc82c69aadce 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -68,7 +69,6 @@ #include #include -#include /* for xpt_print below */ /* Wild guess based on not wanting to grow the stack too much */ #define XPT_PRINT_MAXLEN 512 diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c index d07541a1a9863d..debc6b1e29ee3a 100644 --- a/sys/cam/ctl/ctl_error.c +++ b/sys/cam/ctl/ctl_error.c @@ -49,8 +49,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h index fb2113bef04802..55fb8e30b5e886 100644 --- a/sys/cam/ctl/ctl_error.h +++ b/sys/cam/ctl/ctl_error.h @@ -39,7 +39,7 @@ * Author: Ken Merry */ -#include +#include #ifndef _CTL_ERROR_H_ #define _CTL_ERROR_H_ diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index b7f1e5bce868c4..138f96eaaa49ec 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -58,7 +59,6 @@ #include #include -#include /* for xpt_print below */ #include /* for PRIu64 */ FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack"); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 47c0bde1df3737..e8d9faa5ddca7f 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -57,7 +58,6 @@ #include #include #include -#include /* for xpt_print below */ struct nvme_quirk_entry { u_int quirks; diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 7456998a4f8846..867079cb868b1e 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -24,7 +24,7 @@ #ifdef _KERNEL #include -#include +#include #else #include #endif diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 4415e940cd9656..9705a0b890b41f 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -39,14 +39,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 21cb6beaf1fbaa..2bb59cb2d92bb2 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,6 @@ #include #include #include -#include /* for xpt_print below */ struct scsi_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c index ec088f216cb38f..4c8eb533e9305a 100644 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') diff --git a/sys/cddl/compat/opensolaris/sys/cmn_err.h b/sys/cddl/compat/opensolaris/sys/cmn_err.h index 2623693ec8b728..b3ebf6414e8be8 100644 --- a/sys/cddl/compat/opensolaris/sys/cmn_err.h +++ b/sys/cddl/compat/opensolaris/sys/cmn_err.h @@ -28,7 +28,7 @@ #define _OPENSOLARIS_SYS_CMN_ERR_H_ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/sys/cddl/compat/opensolaris/sys/varargs.h b/sys/cddl/compat/opensolaris/sys/varargs.h index 9684502756cbc8..bede89fafa189c 100644 --- a/sys/cddl/compat/opensolaris/sys/varargs.h +++ b/sys/cddl/compat/opensolaris/sys/varargs.h @@ -28,7 +28,7 @@ #define _OPENSOLARIS_SYS_VARARGS_H_ #ifdef _KERNEL -#include +#include #else #include #endif diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index 99a77ba65eb851..da9c4ee2ab76ca 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -49,12 +49,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/cddl/dev/profile/profile.c b/sys/cddl/dev/profile/profile.c index 677c7543795fff..af93bae15779fe 100644 --- a/sys/cddl/dev/profile/profile.c +++ b/sys/cddl/dev/profile/profile.c @@ -48,11 +48,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/cddl/dev/systrace/systrace.c b/sys/cddl/dev/systrace/systrace.c index c14a663d199531..d8fe1a6430c6c2 100644 --- a/sys/cddl/dev/systrace/systrace.c +++ b/sys/cddl/dev/systrace/systrace.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -54,8 +55,6 @@ #include -#include - #ifdef LINUX_SYSTRACE #if defined(__amd64__) #include diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index e0c010cb5e48d9..91080048987411 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -40,11 +40,10 @@ #include #include #include +#include #include #include -#include - #include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h index b3cbe2ed2e02ff..8f9f034aabd85e 100644 --- a/sys/compat/linuxkpi/common/include/linux/kmod.h +++ b/sys/compat/linuxkpi/common/include/linux/kmod.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define request_module(...) \ diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h index 512f47f9e4b4a5..98f55d1234c43a 100644 --- a/sys/compat/linuxkpi/common/include/linux/kobject.h +++ b/sys/compat/linuxkpi/common/include/linux/kobject.h @@ -29,7 +29,7 @@ #ifndef _LINUXKPI_LINUX_KOBJECT_H_ #define _LINUXKPI_LINUX_KOBJECT_H_ -#include +#include #include #include diff --git a/sys/compat/linuxkpi/common/include/linux/stdarg.h b/sys/compat/linuxkpi/common/include/linux/stdarg.h index ab2fdf7534e511..698ac45e9198a6 100644 --- a/sys/compat/linuxkpi/common/include/linux/stdarg.h +++ b/sys/compat/linuxkpi/common/include/linux/stdarg.h @@ -28,6 +28,6 @@ #ifndef _LINUXKPI_STDARG_H_ #define _LINUXKPI_STDARG_H_ -#include +#include #endif /* _LINUXKPI_STDARG_H_ */ diff --git a/sys/compat/linuxkpi/common/include/stdarg.h b/sys/compat/linuxkpi/common/include/stdarg.h index ab2fdf7534e511..698ac45e9198a6 100644 --- a/sys/compat/linuxkpi/common/include/stdarg.h +++ b/sys/compat/linuxkpi/common/include/stdarg.h @@ -28,6 +28,6 @@ #ifndef _LINUXKPI_STDARG_H_ #define _LINUXKPI_STDARG_H_ -#include +#include #endif /* _LINUXKPI_STDARG_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index 3e2938ab2c2b05..f212858d947b97 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -60,8 +61,6 @@ #include #include -#include - #if defined(__i386__) || defined(__amd64__) #include #include diff --git a/sys/compat/linuxkpi/common/src/linux_idr.c b/sys/compat/linuxkpi/common/src/linux_idr.c index 59c37519468928..664177835c859b 100644 --- a/sys/compat/linuxkpi/common/src/linux_idr.c +++ b/sys/compat/linuxkpi/common/src/linux_idr.c @@ -34,8 +34,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index a9942a657dce25..813ba0b35b74b8 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -43,13 +43,13 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h index e12c87546bf078..a09b5c3f54c12e 100644 --- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h +++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h @@ -179,10 +179,10 @@ #include #include +#include #include #include #include -#include #include "opt_acpi.h" diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index a977d7941aa36c..c73bc218912165 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -42,10 +42,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include -#include - #else #include #include diff --git a/sys/contrib/libnv/cnvlist.c b/sys/contrib/libnv/cnvlist.c index 6597be30c9f270..5fbc731f9b6e8a 100644 --- a/sys/contrib/libnv/cnvlist.c +++ b/sys/contrib/libnv/cnvlist.c @@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/libnv/dnvlist.c b/sys/contrib/libnv/dnvlist.c index 0472deabd150fe..7c58979e02370b 100644 --- a/sys/contrib/libnv/dnvlist.c +++ b/sys/contrib/libnv/dnvlist.c @@ -38,8 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/libnv/nvlist.c b/sys/contrib/libnv/nvlist.c index 00ba3b41f3a31f..41edc72322c317 100644 --- a/sys/contrib/libnv/nvlist.c +++ b/sys/contrib/libnv/nvlist.c @@ -44,8 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - -#include +#include #else #include diff --git a/sys/contrib/ncsw/inc/stdarg_ext.h b/sys/contrib/ncsw/inc/stdarg_ext.h index 7379a4e5ed52f0..2515c4cfe9081b 100644 --- a/sys/contrib/ncsw/inc/stdarg_ext.h +++ b/sys/contrib/ncsw/inc/stdarg_ext.h @@ -40,7 +40,7 @@ #elif defined(NCSW_FREEBSD) #include #include -#include +#include #else #include diff --git a/sys/contrib/ncsw/user/env/xx.c b/sys/contrib/ncsw/user/env/xx.c index ecfe052e59664e..0a502c64e2fb3a 100644 --- a/sys/contrib/ncsw/user/env/xx.c +++ b/sys/contrib/ncsw/user/env/xx.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -45,7 +46,6 @@ #include #include #include -#include #include #include diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c index eb74720c984a6d..77f2c0b60fe7d3 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_string.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c index 59aa19672443ed..2c69dbb5cf57cb 100644 --- a/sys/contrib/rdma/krping/krping_dev.c +++ b/sys/contrib/rdma/krping/krping_dev.c @@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$"); #include /* uio struct */ #include #include +#include #include -#include #include "krping.h" diff --git a/sys/contrib/vchiq/interface/compat/vchi_bsd.c b/sys/contrib/vchiq/interface/compat/vchi_bsd.c index f831880f5e1329..8f47b3dc02d63d 100644 --- a/sys/contrib/vchiq/interface/compat/vchi_bsd.c +++ b/sys/contrib/vchiq/interface/compat/vchi_bsd.c @@ -36,12 +36,11 @@ #include #include #include +#include #include #include #include -#include - #include "mbox_if.h" #include diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index 4585b65df11d5a..23a10d78c10dd7 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -42,10 +42,9 @@ #include #include #include +#include #include -#include - #include #include diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index 0ca2b0bb952cc6..d22b8ca12ebf38 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -29,8 +29,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/aacraid/aacraid_debug.c b/sys/dev/aacraid/aacraid_debug.c index 0000e7d070a862..ca008cc082fc05 100644 --- a/sys/dev/aacraid/aacraid_debug.c +++ b/sys/dev/aacraid/aacraid_debug.c @@ -51,13 +51,12 @@ #include #include #include - #include #include +#include #include #include -#include #include diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index d5ce503f62ee62..4ef3259dd10f84 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -37,8 +37,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 59bcca0b3d4730..f29d803e99a8e3 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -34,10 +34,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 97963784b5610e..c9e6c35f42336a 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 5bfa1ce3a629be..2e77c0f6478e24 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -37,11 +37,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c index 0b76c00e9567bc..0255141b4d156e 100644 --- a/sys/dev/ata/ata-isa.c +++ b/sys/dev/ata/ata-isa.c @@ -34,9 +34,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 6d8b8fb3aad16f..cb44f98c406d78 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -36,12 +36,15 @@ #include #include #include +#include #include + #include -#include + #include #include #include + #include #include #include diff --git a/sys/dev/ata/ata-sata.c b/sys/dev/ata/ata-sata.c index 57fea391825bd5..b3155a5625c1c5 100644 --- a/sys/dev/ata/ata-sata.c +++ b/sys/dev/ata/ata-sata.c @@ -36,9 +36,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c index 8060887972322f..d1fc5ac028b798 100644 --- a/sys/dev/ata/chipsets/ata-acard.c +++ b/sys/dev/ata/chipsets/ata-acard.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c index c34affcabc35b7..7d602eda6f63f6 100644 --- a/sys/dev/ata/chipsets/ata-acerlabs.c +++ b/sys/dev/ata/chipsets/ata-acerlabs.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c index 19fce249fc0866..31776028ee35e4 100644 --- a/sys/dev/ata/chipsets/ata-amd.c +++ b/sys/dev/ata/chipsets/ata-amd.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c index 27eaefa1dc913a..154e55428af510 100644 --- a/sys/dev/ata/chipsets/ata-ati.c +++ b/sys/dev/ata/chipsets/ata-ati.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c index 96bb48d1c047a5..8f5012ed6ef017 100644 --- a/sys/dev/ata/chipsets/ata-cenatek.c +++ b/sys/dev/ata/chipsets/ata-cenatek.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c index d956f79b108995..b43ea58f927285 100644 --- a/sys/dev/ata/chipsets/ata-cypress.c +++ b/sys/dev/ata/chipsets/ata-cypress.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c index e0921b2c334d5b..12bfa3eec7ce2f 100644 --- a/sys/dev/ata/chipsets/ata-cyrix.c +++ b/sys/dev/ata/chipsets/ata-cyrix.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c index 23ddf05a5f51ba..9d6137829f6eb6 100644 --- a/sys/dev/ata/chipsets/ata-highpoint.c +++ b/sys/dev/ata/chipsets/ata-highpoint.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c index 866ac03133ab8e..f6ea4f8519f966 100644 --- a/sys/dev/ata/chipsets/ata-intel.c +++ b/sys/dev/ata/chipsets/ata-intel.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c index bbcaeee194ae7a..3af1c376439690 100644 --- a/sys/dev/ata/chipsets/ata-ite.c +++ b/sys/dev/ata/chipsets/ata-ite.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c index 3a5c359dcd9ebd..b1671c5aa2646e 100644 --- a/sys/dev/ata/chipsets/ata-jmicron.c +++ b/sys/dev/ata/chipsets/ata-jmicron.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c index c17b04744543bb..c0c9bb71e5c71f 100644 --- a/sys/dev/ata/chipsets/ata-marvell.c +++ b/sys/dev/ata/chipsets/ata-marvell.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c index 092453865513d2..c85fbd580cccbe 100644 --- a/sys/dev/ata/chipsets/ata-micron.c +++ b/sys/dev/ata/chipsets/ata-micron.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c index eb5da805bc3c59..75f24610d91082 100644 --- a/sys/dev/ata/chipsets/ata-national.c +++ b/sys/dev/ata/chipsets/ata-national.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c index f112634f7ea570..1bdff26f99e5a0 100644 --- a/sys/dev/ata/chipsets/ata-netcell.c +++ b/sys/dev/ata/chipsets/ata-netcell.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c index 6e1769375f64f5..5078ed35214de8 100644 --- a/sys/dev/ata/chipsets/ata-nvidia.c +++ b/sys/dev/ata/chipsets/ata-nvidia.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c index 15c6ae84c1bb30..23b4d6d64b0baa 100644 --- a/sys/dev/ata/chipsets/ata-promise.c +++ b/sys/dev/ata/chipsets/ata-promise.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c index c6a6a26959ea04..66487b4ff56433 100644 --- a/sys/dev/ata/chipsets/ata-serverworks.c +++ b/sys/dev/ata/chipsets/ata-serverworks.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c index 75c7961caebcd4..d5ecb8f3cf5919 100644 --- a/sys/dev/ata/chipsets/ata-siliconimage.c +++ b/sys/dev/ata/chipsets/ata-siliconimage.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c index b31d76fe3f7c04..b4861e694cb615 100644 --- a/sys/dev/ata/chipsets/ata-sis.c +++ b/sys/dev/ata/chipsets/ata-sis.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c index 4b7dd0f085545a..7f23a5d6bf9a26 100644 --- a/sys/dev/ata/chipsets/ata-via.c +++ b/sys/dev/ata/chipsets/ata-via.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c index b9098121629dad..6278d6dbdb8fa2 100644 --- a/sys/dev/ath/ah_osdep.c +++ b/sys/dev/ath/ah_osdep.c @@ -42,8 +42,7 @@ #include #include #include - -#include +#include #include /* XXX for ether_sprintf */ diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_private.h b/sys/dev/bhnd/nvram/bhnd_nvram_private.h index 8513039c2c7cb7..bbf646ff180667 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_private.h +++ b/sys/dev/bhnd/nvram/bhnd_nvram_private.h @@ -39,8 +39,7 @@ #ifdef _KERNEL #include - -#include +#include #else #include #include diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_value.h b/sys/dev/bhnd/nvram/bhnd_nvram_value.h index 3e7e94d9c81d31..f5c4e1e70b90c7 100644 --- a/sys/dev/bhnd/nvram/bhnd_nvram_value.h +++ b/sys/dev/bhnd/nvram/bhnd_nvram_value.h @@ -34,7 +34,7 @@ #include #ifdef _KERNEL -#include +#include #else /* !_KERNEL */ #include #endif /* _KERNEL */ diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index cb71fa5b0e88bb..f456d7eb45cf8c 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -51,7 +51,7 @@ #include #include #else -#include +#include #endif #include "e6000swreg.h" diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 431396e445352a..58fcd1d5ea3d3e 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -77,7 +78,6 @@ #include #include -#include #include #include diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c index 3095d197aca037..dabb9eea192b29 100644 --- a/sys/dev/filemon/filemon_wrapper.c +++ b/sys/dev/filemon/filemon_wrapper.c @@ -33,12 +33,11 @@ #include #include #include +#include #include #include #include -#include - static void filemon_output_event(struct filemon *filemon, const char *fmt, ...) __printflike(2, 3); diff --git a/sys/dev/gpio/qoriq_gpio.c b/sys/dev/gpio/qoriq_gpio.c index 63a9c3f857f60b..25dfccede29fa9 100644 --- a/sys/dev/gpio/qoriq_gpio.c +++ b/sys/dev/gpio/qoriq_gpio.c @@ -35,10 +35,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h index b92cd06e9f0641..96c62ae0910f4c 100644 --- a/sys/dev/hpt27xx/os_bsd.h +++ b/sys/dev/hpt27xx/os_bsd.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c index 8252dbad4a07e4..b7b885a7c73279 100644 --- a/sys/dev/hptiop/hptiop.c +++ b/sys/dev/hptiop/hptiop.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -49,7 +50,6 @@ #include #include -#include #include #include diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c index 8f9fffdc5af162..38fe61ee7e04af 100644 --- a/sys/dev/hptmv/hptproc.c +++ b/sys/dev/hptmv/hptproc.c @@ -32,8 +32,8 @@ #include #include #include +#include #include -#include #ifndef __KERNEL__ #define __KERNEL__ diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h index 75ac04323d571a..d262980721d04d 100644 --- a/sys/dev/hptnr/os_bsd.h +++ b/sys/dev/hptnr/os_bsd.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h index b351a13cba3c3f..927c73ab47f863 100644 --- a/sys/dev/hptrr/os_bsd.h +++ b/sys/dev/hptrr/os_bsd.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -62,7 +63,6 @@ #include #include -#include #include #include diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index 5ce6e545158cf8..189a3e66a0397c 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/iavf/iavf_iflib.h b/sys/dev/iavf/iavf_iflib.h index ec083d66a20912..83891f9ed52096 100644 --- a/sys/dev/iavf/iavf_iflib.h +++ b/sys/dev/iavf/iavf_iflib.h @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -94,7 +95,6 @@ #include #include #include -#include #include #include #include "ifdi_if.h" diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h index f3ccd9f0c52ff4..1fe8d45425e306 100644 --- a/sys/dev/iavf/iavf_lib.h +++ b/sys/dev/iavf/iavf_lib.h @@ -40,7 +40,7 @@ #define _IAVF_LIB_H_ #include -#include +#include #include #ifdef RSS #include diff --git a/sys/dev/iavf/iavf_osdep.c b/sys/dev/iavf/iavf_osdep.c index 1c3aefe253a164..b81fded48926f3 100644 --- a/sys/dev/iavf/iavf_osdep.c +++ b/sys/dev/iavf/iavf_osdep.c @@ -37,7 +37,7 @@ * independent layer for sharing code between drivers on different operating * systems. */ -#include +#include #include "iavf_iflib.h" diff --git a/sys/dev/ice/ice_osdep.c b/sys/dev/ice/ice_osdep.c index 88b4984c290f05..bb3d4ef9804035 100644 --- a/sys/dev/ice/ice_osdep.c +++ b/sys/dev/ice/ice_osdep.c @@ -40,7 +40,7 @@ #include "ice_common.h" #include "ice_iflib.h" -#include +#include #include /** diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c index bf1f88ec9ca559..ad18ff39961aa9 100644 --- a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -42,11 +42,11 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/ioat/ioat.c b/sys/dev/ioat/ioat.c index e38b20c005f1c1..c658eeb4fe060b 100644 --- a/sys/dev/ioat/ioat.c +++ b/sys/dev/ioat/ioat.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,6 @@ #include #include #include -#include #ifdef DDB #include diff --git a/sys/dev/ioat/ioat_test.c b/sys/dev/ioat/ioat_test.c index 6ff3494a76da03..958297f65a56c6 100644 --- a/sys/dev/ioat/ioat_test.c +++ b/sys/dev/ioat/ioat_test.c @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/sys/dev/isci/isci_logger.c b/sys/dev/isci/isci_logger.c index 62685d52faf996..b5653603a04e58 100644 --- a/sys/dev/isci/isci_logger.c +++ b/sys/dev/isci/isci_logger.c @@ -37,7 +37,7 @@ #include #include -#include +#include #include #define ERROR_LEVEL 0 diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 73390fa14769fb..f557ad1ff5fbe4 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -50,7 +51,6 @@ #include #include -#include #include #include diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h index f45354d293007c..95379448b570e7 100644 --- a/sys/dev/ixl/ixl.h +++ b/sys/dev/ixl/ixl.h @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -96,7 +97,6 @@ #include #include #include -#include #ifdef RSS #include diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index b4999e204ab7fb..2bd69e4756169e 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -58,13 +58,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index 048b3cb7a53d9c..5f3a27a468b0a5 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c index 766473370dca70..d9744b1054c2f0 100644 --- a/sys/dev/mpr/mpr_sas_lsi.c +++ b/sys/dev/mpr/mpr_sas_lsi.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 3cf29aa4e89349..d69c8ea5fded07 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -51,13 +51,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c index aeec50433e0497..e2d1ef2b013a98 100644 --- a/sys/dev/mps/mps_sas_lsi.c +++ b/sys/dev/mps/mps_sas_lsi.c @@ -52,13 +52,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/mpt/mpt_debug.c b/sys/dev/mpt/mpt_debug.c index 8e8cb0cf413a15..f2441c78c660a2 100644 --- a/sys/dev/mpt/mpt_debug.c +++ b/sys/dev/mpt/mpt_debug.c @@ -75,7 +75,7 @@ #include -#include /* for use by mpt_prt below */ +#include /* for use by mpt_prt below */ struct Error_Map { int Error_Code; diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c index d4761c0fef676d..5ff08ffcf2b373 100644 --- a/sys/dev/mpt/mpt_raid.c +++ b/sys/dev/mpt/mpt_raid.c @@ -57,10 +57,9 @@ #include #include +#include #include -#include - struct mpt_raid_action_result { union { diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 9677d16f088c90..4132af157a6212 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -37,8 +37,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index 9dfb5e3bbeddab..f0df709db7328a 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -36,8 +36,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 8712dc0123e8a1..69b86a8c695096 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -35,8 +35,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 98a9e62f851b9e..291d02914d18ec 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "nvme_private.h" diff --git a/sys/dev/nvmf/host/nvmf_ns.c b/sys/dev/nvmf/host/nvmf_ns.c index 87cb4fa68001c2..4215c8295d2ee0 100644 --- a/sys/dev/nvmf/host/nvmf_ns.c +++ b/sys/dev/nvmf/host/nvmf_ns.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff35548d8..331d5b07aecde5 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -56,10 +56,10 @@ #include #include #include +#include #include #include -#include #include diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c index 4b0451824df543..fd9a9f80af396d 100644 --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -32,12 +32,11 @@ #include #include #include +#include #include #include -#include - #include #include #include diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c index 47a2cabf44a601..8df768dffbcd74 100644 --- a/sys/dev/ofw/ofw_standard.c +++ b/sys/dev/ofw/ofw_standard.c @@ -60,10 +60,9 @@ #include #include #include +#include #include -#include - #include #include diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index f9c73122b454e3..f66631ba77c7f4 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -68,8 +68,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 84db16587bdecd..45b727c3bd432b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,6 @@ #include #include #include -#include #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) #include diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index e65006c436fac8..1f72391fb6b491 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -43,10 +43,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/pci/pci_iov_schema.c b/sys/dev/pci/pci_iov_schema.c index 804a8b1c0a8f8c..f60c687f9b870b 100644 --- a/sys/dev/pci/pci_iov_schema.c +++ b/sys/dev/pci/pci_iov_schema.c @@ -33,8 +33,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c index 1e2cb17640a20a..d43f30374170f3 100644 --- a/sys/dev/ppbus/ppb_msq.c +++ b/sys/dev/ppbus/ppb_msq.c @@ -29,7 +29,7 @@ */ #include -#include +#include #include #include diff --git a/sys/dev/proto/proto_core.c b/sys/dev/proto/proto_core.c index 2a7fe3bf9f3380..88963f9154b6c8 100644 --- a/sys/dev/proto/proto_core.c +++ b/sys/dev/proto/proto_core.c @@ -38,11 +38,11 @@ #include #include #include +#include #include #include #include #include -#include #include diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c index 353d4180880033..2afb989e8590f2 100644 --- a/sys/dev/pst/pst-iop.c +++ b/sys/dev/pst/pst-iop.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c index 54eeb5c755c11d..3c1f740cf2f804 100644 --- a/sys/dev/pst/pst-pci.c +++ b/sys/dev/pst/pst-pci.c @@ -37,9 +37,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c index f1d66f7598ed27..3e98ed9eb1d226 100644 --- a/sys/dev/pst/pst-raid.c +++ b/sys/dev/pst/pst-raid.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c index bcd2d687acb211..95b611fb3c2c68 100644 --- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c +++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/dev/random/fenestrasX/fx_rng.c b/sys/dev/random/fenestrasX/fx_rng.c index eb6c19b9179c2e..5faaea1cca3ae3 100644 --- a/sys/dev/random/fenestrasX/fx_rng.c +++ b/sys/dev/random/fenestrasX/fx_rng.c @@ -34,11 +34,11 @@ #include #include #include +#include #include #include #include -#include #define CHACHA_EMBED #define KEYSTREAM_ONLY diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c index 47dd418aa2defa..6a4a08a5c72744 100644 --- a/sys/dev/rndtest/rndtest.c +++ b/sys/dev/rndtest/rndtest.c @@ -41,8 +41,8 @@ #include #include #include +#include #include -#include #include diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 0be20e7aa523fe..eb6e21cb6cf3ce 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -40,13 +40,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index df11b36ec84411..eb6848eddee241 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 94e97f197a9318..be852a3db36787 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -37,11 +37,11 @@ #include #include #include +#include #include #include #include -#include #include diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0985f03e1cb79d..1f1a7f6aa19149 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -72,7 +73,6 @@ #include #include #endif -#include #if defined(__amd64__) || defined(__i386__) #include diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c index e608d6c95eadc7..0ee43f6d2d94d5 100644 --- a/sys/dev/uart/uart_core.c +++ b/sys/dev/uart/uart_core.c @@ -38,11 +38,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index faae077916f382..d15d1d0c6ac285 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -36,11 +36,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c index a736a12fc4f46d..293b0c72587fbf 100644 --- a/sys/dev/usb/usb_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -80,8 +80,7 @@ #include #include #include - -#include +#include #endif /* USB_GLOBAL_INCLUDE_FILE */ #if USB_HAVE_UGEN diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c index 68da81a9785599..857da56ba426a3 100644 --- a/sys/dev/virtio/scsi/virtio_scsi.c +++ b/sys/dev/virtio/scsi/virtio_scsi.c @@ -41,8 +41,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index bfe080b16f0307..cb30b6efa4845c 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -45,12 +45,12 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c index f1a298a2aefae6..1d12d6caa257e9 100644 --- a/sys/dev/xen/console/xen_console.c +++ b/sys/dev/xen/console/xen_console.c @@ -42,8 +42,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index b7a810bf9e15bd..943a6705d356e6 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -31,13 +31,12 @@ #include #include #include +#include #include #include #include -#include - #include #include #include diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c index 2cccc00ca5a781..e5187466f1fe4e 100644 --- a/sys/dev/xen/xenstore/xenstore.c +++ b/sys/dev/xen/xenstore/xenstore.c @@ -45,10 +45,9 @@ #include #include #include +#include #include -#include - #include #include #include diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 8bb51e29e1d1e8..ae9fa51947ccb9 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -71,12 +72,6 @@ #include -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - extern struct mtx ncl_iod_mutex; extern enum nfsiod_state ncl_iodwant[NFS_MAXASYNCDAEMON]; extern struct nfsmount *ncl_iodmount[NFS_MAXASYNCDAEMON]; diff --git a/sys/fs/p9fs/p9_client.h b/sys/fs/p9fs/p9_client.h index 79d402c174e865..4eb82c0232f454 100644 --- a/sys/fs/p9fs/p9_client.h +++ b/sys/fs/p9fs/p9_client.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index 5536bd6b711049..9e9c5e25d2d24c 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -50,8 +51,6 @@ #define GCTL_TABLE 1 #include -#include - static d_ioctl_t g_ctl_ioctl; static struct cdevsw g_ctl_cdevsw = { diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 8607f476db2015..00f3fe6bdcfdd1 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -52,10 +52,10 @@ #include #include #include +#include #include #include #include -#include struct g_dev_softc { struct mtx sc_mtx; diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c index 5de09e5129598c..fa2525eb6db2c7 100644 --- a/sys/geom/geom_dump.c +++ b/sys/geom/geom_dump.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index ad9231905f7a3e..0a76fd6c6f5749 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -48,12 +48,11 @@ #include #include #include +#include #include #include #include -#include - TAILQ_HEAD(event_tailq_head, g_event); static struct event_tailq_head g_events = TAILQ_HEAD_INITIALIZER(g_events); diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 02c8ed9f2baef1..8d6b9a926e1dd8 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -48,10 +48,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c index 0839bc2138171d..8cfffc478849e7 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -45,9 +45,9 @@ #include #include #include +#include #include #include -#include static g_access_t g_slice_access; static g_start_t g_slice_start; diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index 4e2c122ef6ddfb..41cc115225f96f 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -51,10 +51,10 @@ #include #include #include +#include #include #include #include -#include #ifdef DDB #include diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 7f3e1546f2360c..59d2799f26b899 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -41,11 +41,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #ifdef DEV_ISA diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index ca200ce04da798..00367d82139ea8 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #define _KERNEL #include @@ -36,7 +37,6 @@ #include #include -#include #include #include diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c index b26c8c45c4c7db..49e252120cefc2 100644 --- a/sys/isa/pnpparse.c +++ b/sys/isa/pnpparse.c @@ -31,8 +31,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index 5516f316058701..1fa87955a299db 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -33,12 +33,11 @@ #include #include #include +#include #include #include #include -#include - #define dprintf(fmt, ...) \ do { \ if (dotrace_debugging) \ diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index f9d406548d10fc..80d3d9ebd24be2 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -41,9 +41,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/kern/kern_devctl.c b/sys/kern/kern_devctl.c index d83bc380c2feab..7a2818c29b1aba 100644 --- a/sys/kern/kern_devctl.c +++ b/sys/kern/kern_devctl.c @@ -46,13 +46,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index 258268bb874f69..11871dfb0dcae4 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -66,12 +66,12 @@ #include #include #include +#include #include #include #include #include -#include #ifdef ILOG_DEFINE_FOR_FILE ILOG_DEFINE_FOR_FILE(L_ISI_FAIL_POINT, L_ILOG, fail_point); diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 4ef37ac829b35e..1280c2d85277dd 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include #include -#include #ifdef DDB #include #include diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 97d10fdb394a68..cfe2dab2e05ca0 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -42,12 +42,11 @@ #include #include #include +#include #include #include #include -#include - /* * Start a kernel process. This is called after a fork() call in * mi_startup() in the file kern/init_main.c. diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index afeb320405d04b..38a980106e604d 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -112,12 +113,6 @@ SYSCTL_INT(_kern, OID_AUTO, reboot_wait_time, CTLFLAG_RWTUN, &reboot_wait_time, 0, "Seconds to wait before rebooting"); -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #ifdef KDB #ifdef KDB_UNATTENDED int debugger_on_panic = 0; diff --git a/sys/kern/kern_ubsan.c b/sys/kern/kern_ubsan.c index 80328fb089951a..e957d5ebda2c72 100644 --- a/sys/kern/kern_ubsan.c +++ b/sys/kern/kern_ubsan.c @@ -49,9 +49,9 @@ __RCSID("$NetBSD: ubsan.c,v 1.3 2018/08/03 16:31:04 kamil Exp $"); #include #include #include +#include #include #include -#include #define ASSERT(x) KASSERT(x, ("%s: " __STRING(x) " failed", __func__)) #define __arraycount(x) nitems(x) #define ISSET(x, y) ((x) & (y)) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 9506e471705c55..3f5b317efda4d6 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #include -#include #include #include diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index a97c16d6d7dff0..4058e22fd1dd51 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -39,7 +39,7 @@ #ifdef _KERNEL #include #include -#include +#include #else /* !_KERNEL */ #include #include diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 76672279a34b3e..51d66d51db8dc9 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -44,7 +44,7 @@ #include #include #ifdef EPOCH_TRACE -#include +#include #include #include #endif diff --git a/sys/kern/subr_gtaskqueue.c b/sys/kern/subr_gtaskqueue.c index 120ffaba874a1a..e13721ffe1f2cb 100644 --- a/sys/kern/subr_gtaskqueue.c +++ b/sys/kern/subr_gtaskqueue.c @@ -41,9 +41,9 @@ #include #include #include +#include #include #include -#include static MALLOC_DEFINE(M_GTASKQUEUE, "gtaskqueue", "Group Task Queues"); static void gtaskqueue_thread_enqueue(void *); diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index b7cb088f58c717..5fa17db3c0c4ce 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,6 @@ #include #include #include -#include #ifdef DDB #include diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 0c4e589ec1e684..a3238b61482bec 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.14 2020/09/09 16:29:59 maxv Exp $"); #include #include #include +#include #include #include @@ -60,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.14 2020/09/09 16:29:59 maxv Exp $"); #include #include -#include void kmsan_init_arg(size_t); void kmsan_init_ret(size_t); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 131d5456d2f9cb..db0ceb17b9f062 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -69,12 +69,8 @@ #include #endif -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ #ifdef _KERNEL -#include +#include #else #include #endif diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 9b63d72c19d7e8..27e18c114afde0 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -36,9 +36,9 @@ #include #include #include +#include #include #include -#include #else /* _KERNEL */ #include #include diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c index 907318fe1d8374..88a0555ea604f3 100644 --- a/sys/kern/subr_scanf.c +++ b/sys/kern/subr_scanf.c @@ -38,14 +38,9 @@ #include #include #include +#include #include -/* - * Note that stdarg.h and the ANSI style va_start macro is used for both - * ANSI and traditional C compilers. - */ -#include - #define BUF 32 /* Maximum length of numeric string. */ /* diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index c4146922edc595..f17e59a441a6ff 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -42,9 +42,9 @@ #include #include #include +#include #include #include -#include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c index e34ef7087ad6f3..4de52c2ef652aa 100644 --- a/sys/kern/subr_terminal.c +++ b/sys/kern/subr_terminal.c @@ -35,12 +35,11 @@ #include #include #include +#include #include #include #include -#include - static MALLOC_DEFINE(M_TERMINAL, "terminal", "terminal device"); /* diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index aa189e8cd057a5..ab47b6ad29a363 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -105,6 +105,7 @@ #include #include #include +#include #include #include #include @@ -113,8 +114,6 @@ #include #endif -#include - #if !defined(DDB) && !defined(STACK) #error "DDB or STACK options are required for WITNESS" #endif diff --git a/sys/kern/tty.c b/sys/kern/tty.c index b1b3b268d0e956..f06c1fdb3abdb2 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,6 @@ #include -#include - static MALLOC_DEFINE(M_TTY, "tty", "tty device"); static void tty_rel_free(struct tty *tp); diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index d629fa0e7593a6..1291770a9ccb0c 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -65,8 +66,6 @@ #include #include -#include - /* * Our utmp(5) format is limited to 8-byte TTY line names. This means * we can at most allocate 1000 pseudo-terminals ("pts/999"). Allow diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index a09a3049d79c61..cb18468d28bc73 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -67,8 +68,6 @@ #include -#include - #include #include diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9e9b56064ecf52..d0ffdf3050af1e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -77,14 +77,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 41609d7c535121..9476622dc059dd 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -69,14 +69,13 @@ #include #include #include +#include #include #include #ifdef KTRACE #include #endif -#include - #include #include diff --git a/sys/libkern/asprintf.c b/sys/libkern/asprintf.c index a69ceb5b3733f0..fa235615856463 100644 --- a/sys/libkern/asprintf.c +++ b/sys/libkern/asprintf.c @@ -27,8 +27,7 @@ #include #include #include - -#include +#include int vasprintf(char **buf, struct malloc_type *mtp, const char *format, va_list va) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index be047c4913fcf4..475980752a99e8 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -42,8 +42,8 @@ #include /* hz */ #include /* for net/if.h */ #include +#include #include -#include #include #include #include diff --git a/sys/net/if.c b/sys/net/if.c index ce0c3d5c06164a..4ddf71d5fd2352 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -70,7 +71,6 @@ #include #endif -#include #include #include diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 6fa3d03d1cfa0f..c6eea784e1580a 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -92,6 +92,7 @@ #include #include #include +#include #include #include @@ -123,8 +124,6 @@ #include -#include - #include #include diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index 25370f18934fb3..ca635ad8a7b020 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -67,8 +68,6 @@ #include #include -#include - /* * Fib lookup framework. * diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 94be49376adf0f..f2c5778a7ac9ff 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -54,8 +55,6 @@ #include #include -#include - #ifdef DDB #include #include diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 49d313e5077d2b..39fee02bf7517b 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -38,8 +38,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 925918c872dc49..bc8c047dec2b8a 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -939,7 +939,7 @@ ieee80211_getbssid(const struct ieee80211vap *vap, return wh->i_addr3; } -#include +#include void ieee80211_note(const struct ieee80211vap *vap, const char *fmt, ...) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index 1a1d9d8b30644a..448ecc92f0757a 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -49,8 +49,7 @@ #include #include #include - -#include +#include #include diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c index b09e41935d9319..44de6a5fbb4664 100644 --- a/sys/netinet/libalias/alias_db.c +++ b/sys/netinet/libalias/alias_db.c @@ -28,13 +28,13 @@ #include #ifdef _KERNEL -#include #include #include #include #include #include #include +#include #include #else #include diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index 6781c33f5edb75..5ccf31697b4215 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -72,12 +72,12 @@ #ifdef _KERNEL -#include #include #include #include #include #include +#include #include #include #include diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 0d677d954f1132..61779cc314087a 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,6 @@ #include -#include #include extern ipproto_input_t *ip_protox[]; diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 1bb0c0e835cf7d..0379ef7c789a07 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -76,6 +76,7 @@ #include #include #include +#include #include #include @@ -105,8 +106,6 @@ #include -#include - #define satosin6(sa) ((struct sockaddr_in6 *)(sa)) #define ifatoia6(ifa) ((struct in6_ifaddr *)(ifa)) diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index dbb20748cf45af..221ac879cb1865 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -99,7 +100,6 @@ #include #include -#include #define IPSEC_ISTAT(proto, name) do { \ if ((proto) == IPPROTO_ESP) \ diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index d57ac382601243..467d5ded1d7a7b 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -38,10 +38,9 @@ #include #include #include +#include #include -#include - #include #include #include diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index 3c64a65f024d38..bbb6d71c00bdf7 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -93,7 +94,6 @@ #include #include #include -#include /* randomness */ #include diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c index d9297d44c18aee..23c155ed6affff 100644 --- a/sys/netipsec/keysock.c +++ b/sys/netipsec/keysock.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -63,8 +64,6 @@ #include #include -#include - static struct mtx keysock_mtx; MTX_SYSINIT(keysock, &keysock_mtx, "key socket pcb list", MTX_DEF); diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index caef40ff73b9be..4c41235efaac03 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -32,8 +32,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c index 22c35261f7b808..0f333feb747f66 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c +++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c @@ -36,10 +36,10 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c index 1d29dd4f4c84a2..5ca21af49381f6 100644 --- a/sys/powerpc/ofw/ofw_real.c +++ b/sys/powerpc/ofw/ofw_real.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -72,7 +73,6 @@ #include #include #include -#include #include #include diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c index a82d42511a6a18..c27598d8b94b70 100644 --- a/sys/powerpc/ofw/rtas.c +++ b/sys/powerpc/ofw/rtas.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index ae5a35e60577c5..22fa04f0e2bc15 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -39,9 +39,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index 1c1c85ef9b44d9..62404664a55dcb 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index 5363fb1c5854a2..8360f4bcc0dba1 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -38,9 +38,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c index 4ca9ecafc99c19..fff2cc65957066 100644 --- a/sys/powerpc/psim/ata_iobus.c +++ b/sys/powerpc/psim/ata_iobus.c @@ -38,8 +38,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c index 9999a282593379..e137351c471c4e 100644 --- a/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c +++ b/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c @@ -321,7 +321,7 @@ xdr_rpc_gss_unwrap_data(struct mbuf **resultsp, } #ifdef DEBUG -#include +#include void rpc_gss_log_debug(const char *fmt, ...) diff --git a/sys/security/audit/audit_worker.c b/sys/security/audit/audit_worker.c index 6721cbab69b5ac..c7e4b3217ee594 100644 --- a/sys/security/audit/audit_worker.c +++ b/sys/security/audit/audit_worker.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -75,8 +76,6 @@ #include -#include - /* * Worker thread that will schedule disk I/O, etc. */ diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 8175f8ccdab412..f0cdc726499b7c 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -24,13 +24,12 @@ #include #include #include +#include #include #include #include #include -#include - #include static SYSCTL_NODE(_security_mac, OID_AUTO, do, diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c index 640710f2b89ec0..f8eb03f0b6e69a 100644 --- a/sys/tests/ktest.c +++ b/sys/tests/ktest.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,6 @@ #include #include -#include #include struct mtx ktest_mtx; diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 923d9e31b44e71..0c153c0b656ceb 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -35,12 +35,12 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/sys/xen/xenbus/xenbus.c b/sys/xen/xenbus/xenbus.c index 1d73d3c526bbc1..9230a196cf54a9 100644 --- a/sys/xen/xenbus/xenbus.c +++ b/sys/xen/xenbus/xenbus.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -54,8 +55,6 @@ #include #include -#include - MALLOC_DEFINE(M_XENBUS, "xenbus", "XenBus Support"); /*------------------------- Private Functions --------------------------------*/ diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c index b64bc4a99bb436..0d51e9041212ea 100644 --- a/sys/xen/xenbus/xenbusb.c +++ b/sys/xen/xenbus/xenbusb.c @@ -59,14 +59,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c index 7b0d7bd0c0a8f7..b7563b37600711 100644 --- a/sys/xen/xenbus/xenbusb_back.c +++ b/sys/xen/xenbus/xenbusb_back.c @@ -43,14 +43,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusb_front.c b/sys/xen/xenbus/xenbusb_front.c index 393d9ff87f25a5..34fb104e7d9560 100644 --- a/sys/xen/xenbus/xenbusb_front.c +++ b/sys/xen/xenbus/xenbusb_front.c @@ -43,14 +43,13 @@ #include #include #include +#include #include #include #include #include #include -#include - #include #include #include diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h index 2e3d95795c4372..ee444c132c0c26 100644 --- a/sys/xen/xenbus/xenbusvar.h +++ b/sys/xen/xenbus/xenbusvar.h @@ -39,8 +39,7 @@ #include #include #include - -#include +#include #include #include diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h index 3b281ed21b0ea3..8b02262396e8ec 100644 --- a/sys/xen/xenstore/xenstorevar.h +++ b/sys/xen/xenstore/xenstorevar.h @@ -37,8 +37,7 @@ #include #include #include - -#include +#include #include #include diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h index d6b32b10b56dbb..be00779bcb5dd0 100644 --- a/tools/tools/vhba/vhba.h +++ b/tools/tools/vhba/vhba.h @@ -38,12 +38,12 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/tools/uma/smrstress/smrstress.c b/tools/uma/smrstress/smrstress.c index 2d6566c6e6dc49..41fa11b4364c42 100644 --- a/tools/uma/smrstress/smrstress.c +++ b/tools/uma/smrstress/smrstress.c @@ -37,11 +37,10 @@ #include #include #include +#include #include -#include - static uma_zone_t smrs_zone; static smr_t smrs_smr; From d9d8240e0fa76d96e763c32c18b87864f9b5f23c Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Thu, 30 Jan 2025 05:48:06 +0000 Subject: [PATCH 9/9] machine/stdarg.h: add deprecation warning --- sys/arm/include/stdarg.h | 4 +--- sys/arm64/include/stdarg.h | 4 +--- sys/powerpc/include/stdarg.h | 4 +--- sys/riscv/include/stdarg.h | 4 +--- sys/x86/include/stdarg.h | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h index aba008ef377414..42b5b7b400289a 100644 --- a/sys/arm/include/stdarg.h +++ b/sys/arm/include/stdarg.h @@ -30,8 +30,6 @@ #include -#ifndef va_start - #error this file needs to be ported to your compiler -#endif +#warning "machine/stdarg.h is obsolete, use sys/stdarg.h" #endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/arm64/include/stdarg.h b/sys/arm64/include/stdarg.h index aba008ef377414..42b5b7b400289a 100644 --- a/sys/arm64/include/stdarg.h +++ b/sys/arm64/include/stdarg.h @@ -30,8 +30,6 @@ #include -#ifndef va_start - #error this file needs to be ported to your compiler -#endif +#warning "machine/stdarg.h is obsolete, use sys/stdarg.h" #endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/powerpc/include/stdarg.h b/sys/powerpc/include/stdarg.h index aba008ef377414..42b5b7b400289a 100644 --- a/sys/powerpc/include/stdarg.h +++ b/sys/powerpc/include/stdarg.h @@ -30,8 +30,6 @@ #include -#ifndef va_start - #error this file needs to be ported to your compiler -#endif +#warning "machine/stdarg.h is obsolete, use sys/stdarg.h" #endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/riscv/include/stdarg.h b/sys/riscv/include/stdarg.h index aba008ef377414..42b5b7b400289a 100644 --- a/sys/riscv/include/stdarg.h +++ b/sys/riscv/include/stdarg.h @@ -30,8 +30,6 @@ #include -#ifndef va_start - #error this file needs to be ported to your compiler -#endif +#warning "machine/stdarg.h is obsolete, use sys/stdarg.h" #endif /* !_MACHINE_STDARG_H_ */ diff --git a/sys/x86/include/stdarg.h b/sys/x86/include/stdarg.h index aba008ef377414..42b5b7b400289a 100644 --- a/sys/x86/include/stdarg.h +++ b/sys/x86/include/stdarg.h @@ -30,8 +30,6 @@ #include -#ifndef va_start - #error this file needs to be ported to your compiler -#endif +#warning "machine/stdarg.h is obsolete, use sys/stdarg.h" #endif /* !_MACHINE_STDARG_H_ */