FreeBSD/src 39812c7stand/defaults loader.conf loader.conf.5

loader.conf.5: "console" setting does not document multi-value possiblity

PR:             292595
Approved by:    ziaee, dab, imp, tsoome
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54843

(cherry picked from commit 240c614d48cb0484bfe7876decdf6bbdcc99ba73)
DeltaFile
+1-1stand/defaults/loader.conf
+1-0stand/defaults/loader.conf.5
+2-12 files

FreeBSD/src f4c40a5sys/conf files.riscv

riscv: Add ffs.c and ffsdi2.c

These are only needed for GCC, but it doesn't hurt to include these
always.

Reviewed by:    mhorne
Differential Revision:  https://reviews.freebsd.org/D54968
DeltaFile
+2-0sys/conf/files.riscv
+2-01 files

FreeBSD/src 4c822ddsys/libkern ffs.c ffsdi2.c

libkern: Add libcalls for ffs and __ffsdi2

These are needed when compiling a RISC-V kernel with GCC which does
not inline __builtin_ffs*.

The __ffsdi2 is adapated from the previous ffsl.c.

This partially reverts commit f4db342d44198973c1c7b9005d0c5683a582707e.

Reviewed by:    mhorne
Differential Revision:  https://reviews.freebsd.org/D54967
DeltaFile
+47-0sys/libkern/ffs.c
+47-0sys/libkern/ffsdi2.c
+1-0sys/libkern/quad.h
+95-03 files

FreeBSD/src 31b2590sys/conf kern.mk

riscv: Enable the zifencei extension explicitly in -march

clang is more tolerant and implies this extension whereas GCC is
stricter and requires it to be included.

Reviewed by:    mhorne
Differential Revision:  https://reviews.freebsd.org/D54965
DeltaFile
+1-1sys/conf/kern.mk
+1-11 files

FreeBSD/src fe45651stand/libsa Makefile

stand: Add compiler builtins needed by GCC for RISC-V

Reviewed by:    mhorne
Differential Revision:  https://reviews.freebsd.org/D54963
DeltaFile
+3-0stand/libsa/Makefile
+3-01 files

FreeBSD/src 2e8ef82stand/efi/loader/arch/riscv riscv.ldscript

stand: Use the correct OUTPUT_ARCH in the linker script for RISC-V

Compare to the OUTPUT_ARCH in sys/conf/ldscript.riscv.

Reviewed by:    mhorne
Differential Revision:  https://reviews.freebsd.org/D54962
DeltaFile
+1-1stand/efi/loader/arch/riscv/riscv.ldscript
+1-11 files

FreeBSD/src fdd23fcsys/net sff8436.h

sys/net/sff8436.h: Fix the register address of link length of copper or active cable

The register address of link length of copper or active cable is 146 as
per the SFF-8436 specification [1].

[1] 7.6.2 Upper Memory Map Page 00h SFF-8436 Specification (pdf): https://members.snia.org/document/dl/25896

Reviewed by:    imp, zlei
MFC after:      1 week
Pull Request:   https://github.com/freebsd/freebsd-src/pull/1885
Closes:         https://github.com/freebsd/freebsd-src/pull/1885

(cherry picked from commit a537694b49f719d84e3a69a2b8a3098f603da7d7)
DeltaFile
+1-1sys/net/sff8436.h
+1-11 files

FreeBSD/src 2b01cc1sys/dev/qlnx/qlnxe qlnx_os.c

qlnxe: Avoid out-of-bounds reading the multicast ethernet address

The correct length of an ethernet address is ETHER_ADDR_LEN but not
ETHER_HDR_LEN.

MFC after:      1 week

(cherry picked from commit 85f499be90c15a3de02d1c62ce03b99fab52f925)
DeltaFile
+3-3sys/dev/qlnx/qlnxe/qlnx_os.c
+3-31 files

FreeBSD/src 270b9f2sys/dev/mfi mfi_linux.c

mfi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit d12ce84b0d338958b26f6eec86b4967fca8d3bd6)
DeltaFile
+1-9sys/dev/mfi/mfi_linux.c
+1-91 files

FreeBSD/src 3aa4ae2sys/dev/mrsas mrsas_linux.c

mrsas: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit 0a2fb63b4954c540686d387254b65cc6878bd19e)
DeltaFile
+1-9sys/dev/mrsas/mrsas_linux.c
+1-91 files

FreeBSD/src c162d7fsys/dev/liquidio lio_main.c lio_ioctl.c

lio: Avoid out-of-bounds read or write MAC address

While here, replace loop copying the MAC address with memcpy() for
better readability.

Reviewed by:    markj
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54177

(cherry picked from commit 094626d3a5009a56bf1b763dbdfc681ce371dc99)
DeltaFile
+4-6sys/dev/liquidio/lio_main.c
+2-2sys/dev/liquidio/lio_ioctl.c
+6-82 files

FreeBSD/src 14484cdshare/man/man9 locking.9

locking.9: Tweak the table column width to fit 80 characters

While here, add some white spaces to improve the readability of source
code.

Reviewed by:    ziaee, #manpages
MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54121

(cherry picked from commit 176075e661fc657845d788ab3451e690c4e9bac6)
DeltaFile
+7-7share/man/man9/locking.9
+7-71 files

FreeBSD/src 0b0ddadsys/dev/ipmi ipmi_linux.c

ipmi: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit cb0116af7ac794238b0fa569f2722607924fcad6)
DeltaFile
+1-9sys/dev/ipmi/ipmi_linux.c
+1-91 files

FreeBSD/src 957babcsys/amd64/sgx sgx_linux.c

sgx: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit 8350f46d9808e6183d5f6bd4aa73d4d4e563b574)
DeltaFile
+1-10sys/amd64/sgx/sgx_linux.c
+1-101 files

FreeBSD/src 7e9fe8esys/dev/aac aac_linux.c

aac: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit db1844a0e1bcafeb974215033ed682e7fa18cac8)
DeltaFile
+1-9sys/dev/aac/aac_linux.c
+1-91 files

FreeBSD/src 087e77bsys/compat/linux linux_ioctl.h, sys/dev/tdfx tdfx_linux.h tdfx_linux.c

linux: Make the macro LINUX_IOCTL_SET public

There're some other drivers want to register and unregister linux
ioctl handler. Move the macro LINUX_IOCTL_SET from tdfx_linux.h to
linux_ioctl.h so that they can also benefit it.

While here, rename the declaration of linux ioctl function to be
consistent with the name of the handler.

Meanwhile, drop a comment about the macro, since its function is
obvious.

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit 790c27317ec1a997a4e5c2bdee9e4acc610c8e3c)
DeltaFile
+12-0sys/compat/linux/linux_ioctl.h
+0-12sys/dev/tdfx/tdfx_linux.h
+1-1sys/dev/tdfx/tdfx_linux.c
+13-133 files

FreeBSD/src e5d4314sys/dev/aacraid aacraid_linux.c

aacraid: Migrate to use macro LINUX_IOCTL_SET to register linux ioctl handler

Reviewed by:    markj
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53158

(cherry picked from commit ff29e5bc53e6fafc49d1caceed88cbc9e9223189)
DeltaFile
+1-9sys/dev/aacraid/aacraid_linux.c
+1-91 files

FreeBSD/src 871a335sys/x86/xen xen_apic.c

x86/xen: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit c8e077e57b2535b840d391f3217d00465b0514c4)
DeltaFile
+1-1sys/x86/xen/xen_apic.c
+1-11 files

FreeBSD/src b8fb76bsys/amd64/amd64 elf_machdep.c, sys/amd64/linux linux_sysvec.c

imgact: Mark brandinfo and note structures as const

No functional change intended.

Reviewed by:    olce, kib, emaste
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D53062

(cherry picked from commit 80336636b6b9f7a3bdad007c400e85eae017d2a2)

imgact: Mark brandinfo and note structures as const

No functional change intended.

Reviewed by:    kib
MFC after:      10 days
MFC with:       80336636b6b9f7a3bdad007c400e85eae017d2a2
Differential Revision:  https://reviews.freebsd.org/D53173

(cherry picked from commit 301e6c47127d358073a35c1ecd7b8cf014d0bb92)
DeltaFile
+16-16sys/kern/imgact_elf.c
+9-15sys/compat/ia32/ia32_sysvec.c
+7-7sys/sys/imgact_elf.h
+6-8sys/amd64/amd64/elf_machdep.c
+6-6sys/amd64/linux32/linux32_sysvec.c
+6-6sys/amd64/linux/linux_sysvec.c
+50-5811 files not shown
+87-9617 files

FreeBSD/src 4ccfafasys/powerpc/aim mmu_oea64.c, sys/powerpc/cpufreq pmcr.c

powerpc: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 9caa16bd028746af7bee01c6bcc6394de91265db)
DeltaFile
+2-2sys/powerpc/aim/mmu_oea64.c
+2-1sys/powerpc/cpufreq/pmcr.c
+4-32 files

FreeBSD/src 8167663sys/x86/x86 tsc.c

tsc: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit bf8f6545f6ca41e080cc3bc42009bdf253f596b4)
DeltaFile
+1-1sys/x86/x86/tsc.c
+1-11 files

FreeBSD/src adc937esys/i386/i386 pmap.c machdep.c

i386: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 0039721e3bab22446413fb62532e622345770ffb)
DeltaFile
+1-1sys/i386/i386/pmap.c
+1-1sys/i386/i386/machdep.c
+2-22 files

FreeBSD/src 27b2435sys/vm vm_pageout.c vm_meter.c

vm: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit a5d5851c86ebba87f580e4f9bada495ebeedc465)
DeltaFile
+2-2sys/vm/vm_pageout.c
+1-1sys/vm/vm_meter.c
+3-32 files

FreeBSD/src fcdc37fsys/arm/arm unwind.c pmap-v6.c

arm: Use proper prototype for SYSINIT functions

The only possible return value of function module_info_init() is 0. Make
it return void to match the prototype of SYSINIT.

MFC after:      1 week

(cherry picked from commit 0b9c12fa976446705635a94984f45232f034eecf)
DeltaFile
+1-3sys/arm/arm/unwind.c
+1-1sys/arm/arm/pmap-v6.c
+2-42 files

FreeBSD/src bac2badsys/arm64/coresight coresight.c

arm64 coresight: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 5d5ba0c0fa9e2eaeda9d41508bb0f83d5a55f367)
DeltaFile
+1-1sys/arm64/coresight/coresight.c
+1-11 files

FreeBSD/src c48a31esys/security/audit audit.c

audit: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 32c1e940e07c48ab80427efd3d6ff2091407d577)
DeltaFile
+1-1sys/security/audit/audit.c
+1-11 files

FreeBSD/src 2e5a55csys/security/mac mac_framework.c

MAC: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 12ac59a0d1f6ae2065e8e2cb36c53c00771bfc74)
DeltaFile
+2-2sys/security/mac/mac_framework.c
+2-21 files

FreeBSD/src 0e001besys/nfs nfs_diskless.c

nfs: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit a06ecc4f70c296f62f666421c3cf9643d40bdca2)
DeltaFile
+1-1sys/nfs/nfs_diskless.c
+1-11 files

FreeBSD/src 64771eesys/sys sysent.h

sys/sysent.h: Remove an unneeded type cast

The function exec_sysvec_init() already has the right prototype.

While here, remove an extra semicolon from the macro INIT_SYSENTVEC.

MFC after:      1 week

(cherry picked from commit 296db8c72dca1c17d9a4ce94cc8881e48df8187b)
DeltaFile
+1-2sys/sys/sysent.h
+1-21 files

FreeBSD/src a32ee28sys/netipsec xform_ipcomp.c

netipsec: Use proper prototype for SYSINIT functions

MFC after:      1 week

(cherry picked from commit 360bb45690d918fac5bae78ab44f45d11327067a)
DeltaFile
+2-2sys/netipsec/xform_ipcomp.c
+2-21 files