Move most of the contents of opt_compat.h to opt_global.h.
ClosedPublic
Actions

Authored by brooks on Apr 3 2018, 12:45 AM.

Details

Reviewers

emaste
cem
kib
jhb
slm
jtl

Group Reviewers

transport

Commits

rS332122: Move most of the contents of opt_compat.h to opt_global.h.

Summary

opt_compat.h is mentioned in nearly 180 files. In-progress network
driver compabibility improvements may add over 100 more so this is
closer to "just about everywhere" than "only some files" per the
guidance in sys/conf/options.

Keep COMPAT_LINUX32 in opt_compat.h as it is confined to a subset of sys/compat/linux/*.c.

Move COMPAT_LINUXKPI to opt_dontuse.h as it is only used to control the set of compiled files.

Test Plan

builds for amd64, needs a universe run

Some risk of suprising changes exists due to failure to include
opt_compat.h correctly before.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 15951
Build 15943: arc lint + arc unit

Event Timeline

brooks created this revision.Apr 3 2018, 12:45 AM

Herald added a reviewer: slm. · View Herald TranscriptApr 3 2018, 12:45 AM

Herald added a reviewer: transport. · View Herald Transcript

Herald added subscribers: ae, vangyzen, jhibbits, andrew. · View Herald Transcript

Harbormaster completed remote builds in B15951: Diff 41010.Apr 3 2018, 12:45 AM

cem accepted this revision.Apr 3 2018, 1:20 AM

kib added inline comments.Apr 3 2018, 9:44 AM

sys/conf/options
94	Why did you moved COMPAT_LINUXKPI ? I do not think that this option is ever tested by #ifdef.
sys/conf/options.amd64
20	COMPAT_LINUX32 is localized in the linuxolator files and certainly does not make much sense in global exposition.

Move COMPAT_LINUXKPI to opt_dontuse.h as it's never tested by #ifdef.
Move COMPAT_LINUX32 back to opt_compat.h.

Harbormaster completed remote builds in B15956: Diff 41022.Apr 3 2018, 3:50 PM

brooks retitled this revision from Move the contents of opt_compat.h to opt_global.h. to Move most of the contents of opt_compat.h to opt_global.h..Apr 3 2018, 3:55 PM

brooks edited the summary of this revision. (Show Details)

kib accepted this revision.Apr 3 2018, 4:09 PM

jhb accepted this revision.Apr 3 2018, 6:04 PM

The changes to sys/netinet are trivial.

This revision is now accepted and ready to land.Apr 5 2018, 10:23 PM

Herald added a reviewer: transport. · View Herald TranscriptApr 5 2018, 10:23 PM

This revision now requires review to proceed.Apr 5 2018, 10:23 PM

Remove a file added by accident.
Restore opt_compat.h for linux modules.

Harbormaster completed remote builds in B16007: Diff 41162.Apr 5 2018, 11:14 PM

I'll OK the sys/netinet/tcp_subr.c change on behalf of transport. :-)

This revision is now accepted and ready to land.Apr 6 2018, 12:08 AM

Closed in rS332122.

Revision Contents
Changeset List

Path

Size

sys/

amd64/

2 lines

1 line

1 line

1 line

2 lines

1 line

ia32/

2 lines

2 lines

2 lines

2 lines

1 line

linux/

linux_dummy.c

2 lines

linux_sysvec.c

2 lines

linux32/

2 lines

2 lines

1 line

1 line

1 line

arm/

machdep.c

1 line

vm_machdep.c

2 lines

arm64/

machdep.c

1 line

cam/

scsi/

scsi_enc.c

2 lines

scsi_pass.c

2 lines

compat/

freebsd32/

freebsd32_ioctl.c

2 lines

freebsd32_misc.c

1 line

freebsd32_sysent.c

2 lines

ia32/

ia32_genassym.c

2 lines

ia32_sysvec.c

2 lines

linux/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

1 line

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

conf/

20 lines

4 lines

2 lines

2 lines

2 lines

dev/

aac/

aac.c

1 line

aacraid/

aacraid.c

1 line

acpica/

acpi_hpet.c

1 line

atkbdc/

atkbd.c

1 line

cy/

cy.c

2 lines

drm2/

drmP.h

1 line

drm_ioc32.c

2 lines

i915/

i915_ioc32.c

2 lines

radeon/

radeon_ioc32.c

2 lines

filemon/

filemon.c

2 lines

filemon_wrapper.c

2 lines

kbdmux/

kbdmux.c

1 line

md/

md.c

1 line

mfi/

mfi.c

1 line

mpr/

mpr_user.c

2 lines

mps/

mps_user.c

2 lines

mrsas/

mrsas_linux.c

1 line

null/

null.c

2 lines

pci/

pci_user.c

1 line

rp/

rp.c

2 lines

sio/

sio.c

1 line

syscons/

scvidctl.c

1 line

syscons.c

1 line

uart/

uart_kbd_sun.c

1 line

usb/

input/

ukbd.c

1 line

vkbd/

vkbd.c

1 line

vt/

vt_core.c

2 lines

fs/

cuse/

cuse.c

2 lines

devfs/

devfs_devs.c

2 lines

procfs/

2 lines

2 lines

2 lines

2 lines

2 lines

geom/

geom_dev.c

2 lines

i386/

1 line

1 line

1 line

2 lines

linux/

linux_dummy.c

2 lines

kern/

1 line

2 lines

1 line

1 line

1 line

1 line

1 line

1 line

2 lines

1 line

1 line

2 lines

2 lines

1 line

1 line

1 line

1 line

1 line

1 line

2 lines

3 lines

2 lines

1 line

2 lines

2 lines

2 lines

1 line

1 line

1 line

1 line

1 line

2 lines

1 line

1 line

1 line

1 line

2 lines

1 line

1 line

1 line

mips/

include/

4 lines

4 lines

4 lines

4 lines

mips/

2 lines

2 lines

1 line

1 line

1 line

modules/

aac/

Makefile

2 lines

aacraid/

Makefile

2 lines

cam/

Makefile

1 line

cryptodev/

Makefile

2 lines

cuse/

Makefile

2 lines

drm2/

Makefile

2 lines

i915kms/

Makefile

1 line

radeonkms/

Makefile

1 line

dtrace/

Makefile

2 lines

dtraceall/

Makefile

9 lines

dtraceall.c

1 line

fasttrap/

Makefile

2 lines

filemon/

Makefile

2 lines

hyperv/

vmbus/

Makefile

2 lines

if_tap/

Makefile

7 lines

isp/

Makefile

2 lines

kbdmux/

Makefile

5 lines

linux/

Makefile

4 lines

linux64/

Makefile

2 lines

linux_common/

Makefile

2 lines

mfi/

Makefile

2 lines

mpr/

Makefile

2 lines

mps/

Makefile

2 lines

mqueue/

Makefile

2 lines

procfs/

Makefile

13 lines

rp/

Makefile

7 lines

sem/

Makefile

2 lines

sgx/

Makefile

2 lines

sio/

Makefile

7 lines

sysvipc/

sysvmsg/

Makefile

2 lines

sysvsem/

Makefile

2 lines

sysvshm/

Makefile

2 lines

usb/

ukbd/

Makefile

2 lines

vkbd/

Makefile

5 lines

net/

1 line

1 line

1 line

1 line

netinet/

1 line

1 line

1 line

1 line

1 line

netinet6/

in6.c

1 line

in6_jail.c

1 line

opencrypto/

cryptodev.c

2 lines

powerpc/

aim/

aim_machdep.c

1 line

mmu_oea64.c

1 line

booke/

booke_machdep.c

1 line

include/

reg.h

4 lines

powerpc/

1 line

1 line

2 lines

2 lines

sparc64/

exception.S

1 line

machdep.c

1 line

vm/

1 line

2 lines

1 line

2 lines

x86/

cpu_machdep.c

1 line

tsc.c

1 line

Move most of the contents of opt_compat.h to opt_global.h.ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 41010

sys/amd64/amd64/db_trace.c

sys/amd64/amd64/exception.S

sys/amd64/amd64/genassym.c

sys/amd64/amd64/machdep.c

sys/amd64/amd64/ptrace_machdep.c

sys/amd64/amd64/vm_machdep.c

sys/amd64/ia32/ia32_misc.c

sys/amd64/ia32/ia32_reg.c

sys/amd64/ia32/ia32_signal.c

sys/amd64/ia32/ia32_sigtramp.S

sys/amd64/ia32/ia32_syscall.c

sys/amd64/linux/linux_dummy.c

sys/amd64/linux/linux_sysvec.c

sys/amd64/linux32/linux32_dummy.c

sys/amd64/linux32/linux32_machdep.c

sys/amd64/linux32/linux32_sysent.c

sys/amd64/linux32/linux32_sysvec.c

sys/amd64/linux32/syscalls.master

sys/arm/arm/machdep.c

sys/arm/arm/vm_machdep.c

sys/arm64/arm64/machdep.c

sys/cam/scsi/scsi_enc.c

sys/cam/scsi/scsi_pass.c

sys/compat/freebsd32/freebsd32_ioctl.c

sys/compat/freebsd32/freebsd32_misc.c

sys/compat/freebsd32/freebsd32_sysent.c

sys/compat/ia32/ia32_genassym.c

sys/compat/ia32/ia32_sysvec.c

sys/compat/linux/linux_event.c

sys/compat/linux/linux_file.c

sys/compat/linux/linux_fork.c

sys/compat/linux/linux_futex.c

sys/compat/linux/linux_getcwd.c

sys/compat/linux/linux_ioctl.c

sys/compat/linux/linux_ipc.c

sys/compat/linux/linux_misc.c

sys/compat/linux/linux_signal.c

sys/compat/linux/linux_socket.c

sys/compat/linux/linux_stats.c

sys/compat/linux/linux_sysctl.c

sys/compat/linux/linux_time.c

sys/compat/linux/linux_timer.c

sys/compat/linux/linux_uid16.c

sys/compat/linux/linux_util.c

sys/compat/linux/linux_vdso.c

sys/conf/options

sys/conf/options.amd64

sys/conf/options.arm64

sys/conf/options.mips

sys/conf/options.powerpc

sys/dev/aac/aac.c

sys/dev/aacraid/aacraid.c

sys/dev/acpica/acpi_hpet.c

sys/dev/atkbdc/atkbd.c

sys/dev/cy/cy.c

sys/dev/drm2/drmP.h

sys/dev/drm2/drm_ioc32.c

sys/dev/drm2/i915/i915_ioc32.c

sys/dev/drm2/radeon/radeon_ioc32.c

sys/dev/filemon/filemon.c

sys/dev/filemon/filemon_wrapper.c

sys/dev/kbdmux/kbdmux.c

sys/dev/md/md.c

sys/dev/mfi/mfi.c

sys/dev/mpr/mpr_user.c

sys/dev/mps/mps_user.c

sys/dev/mrsas/mrsas_linux.c

sys/dev/null/null.c

sys/dev/pci/pci_user.c

sys/dev/rp/rp.c

sys/dev/sio/sio.c

sys/dev/syscons/scvidctl.c

sys/dev/syscons/syscons.c

sys/dev/uart/uart_kbd_sun.c

Move most of the contents of opt_compat.h to opt_global.h.
ClosedPublic
Actions

Revision Contents
Changeset List