The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6f4411e45f49dc0fef6d428615df5107ce2e5d
commit 3d6f4411e45f49dc0fef6d428615df5107ce2e5d Author: John Baldwin <j...@freebsd.org> AuthorDate: 2022-04-12 17:06:18 +0000 Commit: John Baldwin <j...@freebsd.org> CommitDate: 2022-04-12 17:06:18 +0000 Remove checks for <sys/cdefs.h> being included. These files no longer depend on the macros required when these checks were added. PR: 263102 (exp-run) Reviewed by: brooks, imp, emaste Differential Revision: https://reviews.freebsd.org/D34804 --- sys/amd64/include/atomic.h | 4 ---- sys/amd64/include/cpufunc.h | 4 ---- sys/amd64/include/pcpu.h | 4 ---- sys/arm/include/armreg.h | 4 ---- sys/i386/include/atomic.h | 4 ---- sys/i386/include/cpufunc.h | 4 ---- sys/i386/include/pcpu.h | 4 ---- sys/powerpc/include/atomic.h | 4 ---- sys/riscv/include/profile.h | 4 ---- sys/sys/linker_set.h | 4 ---- sys/x86/include/x86_ieeefp.h | 4 ---- 11 files changed, 44 deletions(-) diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index 8a7bab8fee2d..159d807f777c 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -30,10 +30,6 @@ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - /* * To express interprocessor (as opposed to processor and device) memory * ordering constraints, use the atomic_*() functions with acquire and release diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index d078805d7ced..99d8c82aa111 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -41,10 +41,6 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - struct region_descriptor; #define readb(va) (*(volatile uint8_t *) (va)) diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h index fa44b048cbe3..a671f01dbad5 100644 --- a/sys/amd64/include/pcpu.h +++ b/sys/amd64/include/pcpu.h @@ -31,10 +31,6 @@ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifndef _SYS_CDEFS_H_ -#error "sys/cdefs.h is a prerequisite for this file" -#endif - #include <machine/segments.h> #include <machine/tss.h> diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h index 02fad3a7fd59..44af2642151a 100644 --- a/sys/arm/include/armreg.h +++ b/sys/arm/include/armreg.h @@ -43,10 +43,6 @@ #ifndef MACHINE_ARMREG_H #define MACHINE_ARMREG_H -#ifndef _SYS_CDEFS_H_ -#error Please include sys/cdefs.h before including machine/armreg.h -#endif - #define INSN_SIZE 4 #define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define PSR_MODE 0x0000001f /* mode mask */ diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h index af6d323e0396..c8fc051bc944 100644 --- a/sys/i386/include/atomic.h +++ b/sys/i386/include/atomic.h @@ -30,10 +30,6 @@ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - #include <sys/atomic_common.h> #ifdef _KERNEL diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 59eb3cc982b3..cd7ba31bdb22 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -40,10 +40,6 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - struct region_descriptor; #define readb(va) (*(volatile uint8_t *) (va)) diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h index 8fbcb2032337..3e86c50b7619 100644 --- a/sys/i386/include/pcpu.h +++ b/sys/i386/include/pcpu.h @@ -31,10 +31,6 @@ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ -#ifndef _SYS_CDEFS_H_ -#error "sys/cdefs.h is a prerequisite for this file" -#endif - #include <machine/segments.h> #include <machine/tss.h> diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h index 43bb239719ae..5b27da8e35ff 100644 --- a/sys/powerpc/include/atomic.h +++ b/sys/powerpc/include/atomic.h @@ -34,10 +34,6 @@ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - #include <sys/atomic_common.h> #ifndef __powerpc64__ diff --git a/sys/riscv/include/profile.h b/sys/riscv/include/profile.h index edfcbd31b73a..049c46b43bb1 100644 --- a/sys/riscv/include/profile.h +++ b/sys/riscv/include/profile.h @@ -34,10 +34,6 @@ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ -#if !defined(_KERNEL) && !defined(_SYS_CDEFS_H_) -#error this file needs sys/cdefs.h as a prerequisite -#endif - #define FUNCTION_ALIGNMENT 32 typedef u_long fptrdiff_t; diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h index 0f495872ce9b..04e031500aac 100644 --- a/sys/sys/linker_set.h +++ b/sys/sys/linker_set.h @@ -32,10 +32,6 @@ #ifndef _SYS_LINKER_SET_H_ #define _SYS_LINKER_SET_H_ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - /* * The following macros are used to declare global sets of objects, which * are collected by the linker into a `linker_set' as defined below. diff --git a/sys/x86/include/x86_ieeefp.h b/sys/x86/include/x86_ieeefp.h index 1bbcd7f01a96..9160ac7c2c61 100644 --- a/sys/x86/include/x86_ieeefp.h +++ b/sys/x86/include/x86_ieeefp.h @@ -47,10 +47,6 @@ * XXX: {FP,SSE}*FLD and {FP,SSE}*OFF are undocumented pollution. */ -#ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite -#endif - /* * Rounding modes. */