diff options
| author | Warner Losh <imp@FreeBSD.org> | 2019-09-26 12:54:52 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2019-09-26 12:54:52 +0000 |
| commit | b61516b6deeeedb24f11853fadb29261be5ab18e (patch) | |
| tree | 0dbc5a36d9b910176ba26f3d8255c8705873fc4b | |
| parent | 40d21e921a551c61306276dfee10a5529ffe6dbf (diff) | |
| download | src-test2-b61516b6deeeedb24f11853fadb29261be5ab18e.tar.gz src-test2-b61516b6deeeedb24f11853fadb29261be5ab18e.zip | |
Notes
| -rw-r--r-- | sys/modules/Makefile | 10 | ||||
| -rw-r--r-- | sys/powerpc/conf/GENERIC | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f72ac8e78521..435734f65f06 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -256,8 +256,8 @@ SUBDIR= \ ${_mly} \ mmc \ mmcsd \ - mpr \ - mps \ + ${_mpr} \ + ${_mps} \ mpt \ mqueue \ mrsas \ @@ -559,6 +559,12 @@ _rtwnfw= rtwnfw _cxgbe= cxgbe .endif +# These rely on 64bit atomics +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "mips" +_mps= mps +_mpr= mpr +.endif + .if ${MK_TESTS} != "no" || defined(ALL_MODULES) SUBDIR+= tests .endif diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index efa604a2aec6..840621dc2cd1 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -120,7 +120,6 @@ options AHC_ALLOW_MEMIO # Attempt to use memory mapped I/O device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D # ATA/SCSI peripherals |