diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
| commit | c01753e18ca18fcdabe7ca7868cf40dd18290c51 (patch) | |
| tree | e38a71b71cf3eef7d8a8112dfb2055d5463b80eb /usr/src/uts/sparc/Makefile.sparc | |
| parent | 0c4959f576fd0569de9fb1c72946987be101e7a0 (diff) | |
| parent | ad309d3e2ef712dfdf1bc08758f232ebd5fe1612 (diff) | |
| download | illumos-joyent-c01753e18ca18fcdabe7ca7868cf40dd18290c51.tar.gz | |
[illumos-gate merge]
commit ad309d3e2ef712dfdf1bc08758f232ebd5fe1612
7761 bootfs_005_neg's pool destruction must handle EBUSY
commit 555da5111b0f2552c42d057b211aba89c9c79f6c
7743 per-vdev-zaps have no initialize path on upgrade
commit 0e93ddde309a21971dc41356b4834acecaeb9e20
7739 zfs_inherit_003_pos fails due to improperly generated random strings
commit 4648396c072c3d0c2a1a38afa5f6717799eb1ac7
7731 libdladm`i_dladm_set_single_prop() leaks memory when resetting properties without default value
commit 5f10ef697f250374b7b917e10961c4e02d4e3112
6396 remove SVM
Conflicts:
usr/src/cmd/dladm/Makefile
usr/src/cmd/Makefile.check
usr/src/lib/Makefile
usr/src/Makefile.lint
Diffstat (limited to 'usr/src/uts/sparc/Makefile.sparc')
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index 4fd54a12ef..c31fa33c40 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -19,12 +19,13 @@ # CDDL HEADER END # +# # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013 Andrew Stormont. All rights reserved. # Copyright (c) 2015, Joyent, Inc. All rights reserved. -# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright 2016 Gary Mills - +# Copyright 2016 Nexenta Systems, Inc. +# # # This makefile contains the common definitions for all sparc @@ -217,7 +218,7 @@ DRV_KMODS += ipsecesp iptun iwscn keysock kmdb kstat ksyms llc1 DRV_KMODS += lofi DRV_KMODS += log logindmux kssl mm nca physmem pm poll pool DRV_KMODS += pseudo ptc ptm pts ptsl ramdisk random rsm rts sad -DRV_KMODS += simnet softmac sppp sppptun sy sysevent sysmsg +DRV_KMODS += simnet softmac sppp sppptun sy sysevent sysmsg DRV_KMODS += spdsock DRV_KMODS += tcp tcp6 timerfd tl tnf ttymux udp udp6 wc winlock zcons zfd DRV_KMODS += ippctl @@ -315,7 +316,7 @@ DRV_KMODS += qlt DRV_KMODS += iscsit DRV_KMODS += pppt DRV_KMODS += ncall nsctl sdbc nskern sv -DRV_KMODS += ii rdc rdcsrv rdcstub +DRV_KMODS += ii rdc rdcsrv rdcstub DRV_KMODS += iscsi DRV_KMODS += emlxs DRV_KMODS += oce @@ -338,12 +339,6 @@ DRV_KMODS += pcs MISC_KMODS += busra cardbus dada pcmcia DRV_KMODS += pcic -# Add lvm -# -DRV_KMODS += md -MISC_KMODS += md_mirror md_stripe md_hotspares md_raid md_trans md_notify -MISC_KMODS += md_sp - # # Exec Class Modules (/kernel/exec): # @@ -407,7 +402,7 @@ MISC_KMODS += idm MISC_KMODS += idmap MISC_KMODS += hook MISC_KMODS += neti -MISC_KMODS += ctf +MISC_KMODS += ctf MISC_KMODS += mac dls MISC_KMODS += cmlb MISC_KMODS += tem |