diff --git a/README.OpenSource b/README.OpenSource index a5026a9..26d72bc 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,7 +3,7 @@ "Name" : "FreeBSD", "License" : "BSD-2-Clause License", "License File" : "COPYRIGHT", - "Version Number" : "14.1", + "Version Number" : "14.2", "Owner" : "tonghaoyang1@huawei.com", "Upstream URL" : "http://www.freebsd.org/", "Description" : "FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms." diff --git a/RELNOTES b/RELNOTES index 1ec11c8..1ff7364 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,10 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +c333758fca3e: + new MAC/do policy and mdo(1) utility which enables a user to + become another user without the requirement of setuid root. + eeb04a736cb9: date(1) now supports nanoseconds. For example: `date -Ins` prints "2024-04-22T12:20:28,763742224+02:00" and diff --git a/UPDATING b/UPDATING index 2d4a66d..3a644b8 100644 --- a/UPDATING +++ b/UPDATING @@ -12,8 +12,35 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -20240604: - 14.1-RELEASE. +20241203: + 14.2-RELEASE. + +20240419: + Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have + been upgraded to 18.1.6. It is important that you run `make delete-old` + as described in the COMMON ITEMS section, otherwise several libc++ + headers that are obsolete and need to be removed can cause compilation + errors in C++ programs. + +20240415: + MFC e0f3dc82727f: If you have an arm64 system that uses ACPI, you will + need to update your loader.efi in the ESP when you update past this + point. Detection of ACPI was moved earlier in the binary so the scripts + could use it, but old binaries don't have this, so we default to 'no + ACPI' in this case. + +20240218: + MFC of 713db49d06de changed 'struct ieee80211vap' internals in net80211. + Given we do not have enough spares and the struct is allocated by + drivers, all wireless drivers have to be recompiled. + __FreeBSD_version is updated to 1400509 to track this change. + +20240207: + sendmail 8.18.1 has been imported and merged. This version enforces + stricter RFC compliance by default, especially with respect to line + endings. This may cause issues with receiving messages from + non-compliant MTAs; please see the first 8.18.1 release note in + contrib/sendmail/RELEASE_NOTES for mitigations. 20240202: Loader now also read configuration files listed in local_loader_conf_files. @@ -36,30 +63,6 @@ and/or ports. 4. And finally, rread local_loader_conf_files files: /boot/loader.conf.local -20240415: - MFC e0f3dc82727f: If you have an arm64 system that uses ACPI, you will - need to update your loader.efi in the ESP when you update past this - point. Detection of ACPI was moved earlier in the binary so the scripts - could use it, but old binaries don't have this, so we default to 'no - ACPI' in this case. - -20240218: - MFC of 713db49d06de changed 'struct ieee80211vap' internals in net80211. - Given we do not have enough spares and the struct is allocated by - drivers, all wireless drivers have to be recompiled. - __FreeBSD_version is updated to 1400509 to track this change. - -20240207: - sendmail 8.18.1 has been imported and merged. This version enforces - stricter RFC compliance by default, especially with respect to line - endings. This may cause issues with receiving messages from - non-compliant MTAs; please see the first 8.18.1 release note in - contrib/sendmail/RELEASE_NOTES for mitigations. - -20231113: - The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled - it is always installed as /usr/bin/ld. - 20240119: Commit d34f4baaf138 changed the internal interface between the nfscommon and nfscl modules. As such, both need to be @@ -80,6 +83,10 @@ and/or ports. sources. As such, __FreeBSD_version has been bumped to 1400502. +20231113: + The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled + it is always installed as /usr/bin/ld. + 20230924: Enable splitting out pkgbase manpages into separate packages by default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf. @@ -314,6 +321,10 @@ and/or ports. belongs. Consequently, users may experience surprising results with such names when roaming to different homenets. +20211118: + Mips has been removed from universe builds. It will be removed from the + tree shortly. + 20211110: Commit b8d60729deef changed the TCP congestion control framework so that any of the included congestion control modules could be @@ -327,10 +338,6 @@ and/or ports. kernel and you are including networking, the kernel compile will fail. Also if no default is declared the kernel compile will fail. -20211118: - Mips has been removed from universe builds. It will be removed from the - tree shortly. - 20211106: Commit f0c9847a6c47 changed the arguments for VOP_ALLOCATE. The NFS modules must be rebuilt from sources and any out @@ -1931,6 +1938,8 @@ COMMON ITEMS: make -DALWAYS_CHECK_MAKE buildkernel KERNCONF=YOUR_KERNEL_HERE make -DALWAYS_CHECK_MAKE installkernel KERNCONF=YOUR_KERNEL_HERE + If you are running kernel modules from ports, see FOOTNOTE [1]. + To test a kernel once --------------------- If you just want to boot a kernel once (because you are not sure @@ -1947,8 +1956,7 @@ COMMON ITEMS: make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE - make installkernel KERNCONF=YOUR_KERNEL_HERE - [1] + make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] etcupdate -p [5] make installworld @@ -1966,7 +1974,7 @@ COMMON ITEMS: make buildworld - make buildkernel KERNCONF=YOUR_KERNEL_HERE + make buildkernel KERNCONF=YOUR_KERNEL_HERE [1] make installworld DESTDIR=${CURRENT_ROOT} -DDB_FROM_SRC @@ -1985,8 +1993,7 @@ COMMON ITEMS: make buildworld [9] make buildkernel KERNCONF=YOUR_KERNEL_HERE [8] - make installkernel KERNCONF=YOUR_KERNEL_HERE - [1] + make installkernel KERNCONF=YOUR_KERNEL_HERE [1] [3] etcupdate -p [5] make installworld @@ -2006,8 +2013,10 @@ COMMON ITEMS: messages there. If in doubt, please track -stable which has much fewer pitfalls. - [1] If you have third party modules, such as vmware, you should disable - them at this point so they don't crash your system on +FOOTNOTES: + + [1] If you have third party modules, such as drm-kmod or vmware, you + should disable them at this point so they don't crash your system on reboot. Alternatively, you should rebuild all the modules you have in your system and install them as well. If you are running -current, you should seriously consider placing all sources to all the modules for diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h index 3a4fa58..4ef2939 100755 --- a/lib/libc/include/fpmath.h +++ b/lib/libc/include/fpmath.h @@ -73,13 +73,13 @@ union IEEEf2bits { float f; struct { #if __BYTE_ORDER == __LITTLE_ENDIAN - unsigned int man : 23; - unsigned int exp : 8; - unsigned int sign : 1; + unsigned int man :23; + unsigned int exp :8; + unsigned int sign :1; #else /* __BIG_ENDIAN */ - unsigned int sign : 1; - unsigned int exp : 8; - unsigned int man : 23; + unsigned int sign :1; + unsigned int exp :8; + unsigned int man :23; #endif } bits; }; @@ -92,19 +92,19 @@ union IEEEd2bits { struct { #if __BYTE_ORDER == __LITTLE_ENDIAN #if _IEEE_WORD_ORDER == __LITTLE_ENDIAN - unsigned int manl : 32; + unsigned int manl :32; #endif - unsigned int manh : 20; - unsigned int exp : 11; - unsigned int sign : 1; + unsigned int manh :20; + unsigned int exp :11; + unsigned int sign :1; #if _IEEE_WORD_ORDER == __BIG_ENDIAN - unsigned int manl : 32; + unsigned int manl :32; #endif #else /* __BIG_ENDIAN */ - unsigned int sign : 1; - unsigned int exp : 11; - unsigned int manh : 20; - unsigned int manl : 32; + unsigned int sign :1; + unsigned int exp :11; + unsigned int manh :20; + unsigned int manl :32; #endif } bits; }; diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c index c0a82cf..93cfa8e 100644 --- a/lib/libc/stdlib/strtoimax.c +++ b/lib/libc/stdlib/strtoimax.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Copyright (c) 2011 The FreeBSD Foundation * @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93"; +static char sccsid[] = "from @(#)strtol.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ // #include // __FBSDID("$FreeBSD$"); diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c index aa04bf0..f1bcba2 100644 --- a/lib/libc/stdlib/strtoul.c +++ b/lib/libc/stdlib/strtoul.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Copyright (c) 2011 The FreeBSD Foundation * @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; +static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ // #include // __FBSDID("$FreeBSD$"); diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c index 946e5f7..043d76e 100644 --- a/lib/libc/stdlib/strtoumax.c +++ b/lib/libc/stdlib/strtoumax.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Copyright (c) 2011 The FreeBSD Foundation * @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93"; +static char sccsid[] = "from @(#)strtoul.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ // #include // __FBSDID("$FreeBSD$"); diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index f13e586..5b99df3 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -412,7 +412,7 @@ do { \ * any extra precision into the type of 'a' -- 'a' should have type float_t, * double_t or long double. b's type should be no larger than 'a's type. * Callers should use these types with scopes as large as possible, to - * reduce their own extra-precision and efficiciency problems. In + * reduce their own extra-precision and efficiency problems. In * particular, they shouldn't convert back and forth just to call here. */ #ifdef DEBUG diff --git a/stand/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c index 471fd50..1861454 100644 --- a/stand/usb/usb_busdma_loader.c +++ b/stand/usb/usb_busdma_loader.c @@ -411,9 +411,9 @@ usb_pc_dmamap_destroy(struct usb_page_cache *pc) *------------------------------------------------------------------------*/ void usb_dma_tag_setup(struct usb_dma_parent_tag *udpt, - struct usb_dma_tag *udt, bus_dma_tag_t dmat, - struct mtx *mtx, usb_dma_callback_t *func, - uint8_t ndmabits, uint8_t nudt) + struct usb_dma_tag *udt, bus_dma_tag_t dmat, + struct mtx *mtx, usb_dma_callback_t *func, + uint8_t ndmabits, uint8_t nudt) { (void)memset_s(udpt, sizeof(*udpt), 0, sizeof(*udpt)); diff --git a/sys/compat/linuxkpi/common/include/linux/compat.h b/sys/compat/linuxkpi/common/include/linux/compat.h index 68a9bdd..70f796b 100644 --- a/sys/compat/linuxkpi/common/include/linux/compat.h +++ b/sys/compat/linuxkpi/common/include/linux/compat.h @@ -26,9 +26,9 @@ * (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 __LINUX_COMPAT_H__ -#define __LINUX_COMPAT_H__ +#ifndef _LINUXKPI_LINUX_COMPAT_H_ +#define _LINUXKPI_LINUX_COMPAT_H_ #include "linux/kernel.h" -#endif /* __LINUX_COMPAT_H__ */ +#endif /* _LINUXKPI_LINUX_COMPAT_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/delay.h b/sys/compat/linuxkpi/common/include/linux/delay.h index 89f7be5..6cd6c94 100644 --- a/sys/compat/linuxkpi/common/include/linux/delay.h +++ b/sys/compat/linuxkpi/common/include/linux/delay.h @@ -2,7 +2,7 @@ * Copyright (c) 2010 Isilon Systems, Inc. * Copyright (c) 2010 iX Systems, Inc. * Copyright (c) 2010 Panasas, Inc. - * Copyright (c) 2013-2015 Mellanox Technologies, Ltd. + * Copyright (c) 2013-2021 Mellanox Technologies, Ltd. * Copyright (c) 2014 François Tigeot * All rights reserved. * @@ -75,4 +75,4 @@ usleep_range(unsigned long min, unsigned long max) #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_DELAY_H_ */ +#endif /* _LINUXKPI_LINUX_DELAY_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/hrtimer.h b/sys/compat/linuxkpi/common/include/linux/hrtimer.h index 2b763ea..4fb5773 100644 --- a/sys/compat/linuxkpi/common/include/linux/hrtimer.h +++ b/sys/compat/linuxkpi/common/include/linux/hrtimer.h @@ -327,4 +327,4 @@ int linux_hrtimer_is_queued(struct hrtimer *timer); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_HRTIMER_H */ +#endif /* _LINUXKPI_LINUX_HRTIMER_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h index 8678ecb..2173c00 100644 --- a/sys/compat/linuxkpi/common/include/linux/interrupt.h +++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h @@ -102,4 +102,4 @@ extern bool irq_bottom_half(struct workqueue_struct *workQueue, irq_bottom_half_ #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_INTERRUPT_H_ */ +#endif /* _LINUXKPI_LINUX_INTERRUPT_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h index e33d086..ef1ef53 100644 --- a/sys/compat/linuxkpi/common/include/linux/jiffies.h +++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h @@ -53,4 +53,4 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_JIFFIES_H_ */ +#endif /* _LINUXKPI_LINUX_JIFFIES_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 88e073d..74ba840 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -534,4 +534,4 @@ extern int munmap(void *addr, size_t length); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_KERNEL_H_ */ +#endif /* _LINUXKPI_LINUX_KERNEL_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/moduleparam.h b/sys/compat/linuxkpi/common/include/linux/moduleparam.h index db9371b..82bae85 100644 --- a/sys/compat/linuxkpi/common/include/linux/moduleparam.h +++ b/sys/compat/linuxkpi/common/include/linux/moduleparam.h @@ -26,8 +26,8 @@ * (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 __LINUX_MODULEPARAM_H__ -#define __LINUX_MODULEPARAM_H__ +#ifndef _LINUXKPI_LINUX_MODULEPARAM_H_ +#define _LINUXKPI_LINUX_MODULEPARAM_H_ #ifdef __cplusplus #if __cplusplus @@ -48,4 +48,4 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* __LINUX_MODULEPARAM_H__ */ +#endif /* _LINUXKPI_LINUX_MODULEPARAM_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/pagemap.h b/sys/compat/linuxkpi/common/include/linux/pagemap.h index 2d3aa27..efda09e 100644 --- a/sys/compat/linuxkpi/common/include/linux/pagemap.h +++ b/sys/compat/linuxkpi/common/include/linux/pagemap.h @@ -25,8 +25,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef __LINUX_PAGEMAP_H__ -#define __LINUX_PAGEMAP_H__ + +#ifndef _LINUXKPI_LINUX_PAGEMAP_H_ +#define _LINUXKPI_LINUX_PAGEMAP_H_ #include "asm/page.h" @@ -58,4 +59,4 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* __LINUX_PAGEMAP_H__ */ +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h index 28552e5..1f1da10 100644 --- a/sys/compat/linuxkpi/common/include/linux/rbtree.h +++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h @@ -160,4 +160,4 @@ rb_replace_node_cached(struct rb_node *old, struct rb_node *new, #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_RBTREE_H_ */ +#endif /* _LINUXKPI_LINUX_RBTREE_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/rwsem.h b/sys/compat/linuxkpi/common/include/linux/rwsem.h index 5af167f..5c297fa 100644 --- a/sys/compat/linuxkpi/common/include/linux/rwsem.h +++ b/sys/compat/linuxkpi/common/include/linux/rwsem.h @@ -51,4 +51,4 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_RWSEM_H_ */ +#endif /* _LINUXKPI_LINUX_RWSEM_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index 2ee1895..cd481cc 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -105,4 +105,4 @@ static inline void sg_init_one(scatterlist_t *psg, const void *buf, unsigned int #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_SCATTERLIST_H_ */ +#endif /* _LINUXKPI_LINUX_SCATTERLIST_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 9e062ea..3422057 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -55,4 +55,4 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_SCHED_H_ */ +#endif /* _LINUXKPI_LINUX_SCHED_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h index 9616698..72b0403 100644 --- a/sys/compat/linuxkpi/common/include/linux/spinlock.h +++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h @@ -90,4 +90,4 @@ SPIN_MACRO_END #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_SPINLOCK_H_ */ +#endif /* _LINUXKPI_LINUX_SPINLOCK_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index fa35d57..9680702 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -26,8 +26,8 @@ * (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 __LINUXKPI_LINUX_STRING_H__ -#define __LINUXKPI_LINUX_STRING_H__ +#ifndef _LINUXKPI_LINUX_STRING_H_ +#define _LINUXKPI_LINUX_STRING_H_ #include_next "string.h" @@ -46,4 +46,4 @@ extern size_t strlcpy(char *dest, const char *src, size_t size); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* __LINUXKPI_LINUX_STRING_H__ */ +#endif /* _LINUXKPI_LINUX_STRING_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index b4277cd..bcd60c4 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -87,4 +87,4 @@ extern int linux_mod_timer(timer_list_t *timer, ULONG expires); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_TIMER_H_ */ +#endif /* _LINUXKPI_LINUX_TIMER_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/types.h b/sys/compat/linuxkpi/common/include/linux/types.h index 4a02ad1..affe0e9 100644 --- a/sys/compat/linuxkpi/common/include/linux/types.h +++ b/sys/compat/linuxkpi/common/include/linux/types.h @@ -31,4 +31,4 @@ #include "sys/types.h" -#endif /* _LINUXKPI_LINUX_TYPES_H_ */ +#endif /* _LINUXKPI_LINUX_TYPES_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h index 63d33f4..ab21c72 100644 --- a/sys/compat/linuxkpi/common/include/linux/workqueue.h +++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h @@ -562,4 +562,4 @@ extern bool linux_cancel_work_sync(struct work_struct *work); #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LINUXKPI_LINUX_WORKQUEUE_H_ */ +#endif /* _LINUXKPI_LINUX_WORKQUEUE_H_ */ diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 1a67f22..7090291 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -631,15 +631,23 @@ * 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: + * 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 - * _POSIX_C_SOURCE == 200112 1003.1-2001 - * _POSIX_C_SOURCE == 200809 1003.1-2008 + * (1003.1 Issue 5, Single Unix Spec v2, Unix 95) + * _POSIX_C_SOURCE == 200112 1003.1-2001 (1003.1 Issue 6, Unix 03) + * _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 with + * _POSIX_C_SOURCE=200809 and _XOPEN_SOURCE=700 * * In addition, the X/Open Portability Guide, which is now the Single UNIX * Specification, defines a feature-test macro which indicates the version of diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h index 7d6f6e9..2d19d15 100644 --- a/sys/sys/kobj.h +++ b/sys/sys/kobj.h @@ -235,7 +235,7 @@ extern u_int kobj_lookup_misses; } else \ kobj_lookup_hits++; \ _m = _ce->func; \ -} while(0) +} while (0) #else #define KOBJOPLOOKUP(OPS,OP) do { \ kobjop_desc_t _desc = &OP##_##desc; \ @@ -246,7 +246,7 @@ extern u_int kobj_lookup_misses; _ce = kobj_lookup_method(OPS->cls, \ _cep, _desc); \ _m = _ce->func; \ -} while(0) +} while (0) #endif kobj_method_t* kobj_lookup_method(kobj_class_t cls, diff --git a/sys/sys/serial.h b/sys/sys/serial.h index f237357..cb15274 100644 --- a/sys/sys/serial.h +++ b/sys/sys/serial.h @@ -45,7 +45,7 @@ #define SER_SRX 0x0008 /* secondary receive */ #define SER_CTS 0x0010 /* clear to send */ #define SER_DCD 0x0020 /* data carrier detect */ -#define SER_RI 0x0040 /* ring indicate */ +#define SER_RI 0x0040 /* ring indicate */ #define SER_DSR 0x0080 /* data set ready */ #define SER_MASK_STATE 0x00ff