diff options
author | hselasky <hselasky@FreeBSD.org> | 2015-12-14 15:45:11 +0000 |
---|---|---|
committer | hselasky <hselasky@FreeBSD.org> | 2015-12-14 15:45:11 +0000 |
commit | 1ae2839ea1814ee42ee813cdc13f7e86f30a37a8 (patch) | |
tree | e9fe4b422630bcaf509353fcb2ef8c4588621663 /sys/i386/conf/XEN | |
parent | f20c3249492e4cc8f2f92d29ffeb00a804cd45f0 (diff) | |
download | FreeBSD-src-1ae2839ea1814ee42ee813cdc13f7e86f30a37a8.zip FreeBSD-src-1ae2839ea1814ee42ee813cdc13f7e86f30a37a8.tar.gz |
Fix the XEN build by disabling the mlx5 and mlx5en modules
when XEN is enabled.
This is a direct commit to stable/10.
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/i386/conf/XEN')
-rw-r--r-- | sys/i386/conf/XEN | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN index c9fdab0..7c0ee3c 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -14,6 +14,9 @@ makeoptions WITHOUT_MODULES="ctl cxgb dpt drm drm2 hptmv ida rdma" # The following drivers don't work with PAE enabled. makeoptions WITHOUT_MODULES+="asr ncr pst" +# The following drivers don't build with XEN enabled. +makeoptions WITHOUT_MODULES+="mlx5 mlx5en" + options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption |