diff options
| author | kib <kib@FreeBSD.org> | 2017-03-03 10:30:30 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-03-03 10:30:30 +0000 |
| commit | 61e0f282396119f24432278763f6a53d0d9e93ff (patch) | |
| tree | b47ba4c8f5d2b257b624f871ba54e9fd31d3e11f /sys/modules | |
| parent | 37ad93a08f316e5b2682d50cdd2fbc5cbd4b5072 (diff) | |
| download | FreeBSD-src-61e0f282396119f24432278763f6a53d0d9e93ff.zip FreeBSD-src-61e0f282396119f24432278763f6a53d0d9e93ff.tar.gz | |
MFC r313898, r313902, r313903, r313934, r314087, r314252:
Merge i386 and amd64 mtrr drivers.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/mem/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile index 3710c5d..0e47a28 100644 --- a/sys/modules/mem/Makefile +++ b/sys/modules/mem/Makefile @@ -3,14 +3,17 @@ .PATH: ${.CURDIR}/../../dev/mem .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} .PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +.PATH: ${.CURDIR}/../../x86/x86 +.endif KMOD= mem SRCS= mem.c memdev.c memutil.c .if ${MACHINE_CPUARCH} == "i386" -SRCS+= i686_mem.c k6_mem.c +SRCS+= x86_mem.c k6_mem.c .endif .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= amd64_mem.c +SRCS+= x86_mem.c .endif SRCS+= bus_if.h device_if.h |
