diff options
| author | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
|---|---|---|
| committer | Patrick Mooney <patrick.f.mooney@gmail.com> | 2015-09-16 14:55:15 +0000 |
| commit | 31a74c182cf2b5150a704786c53c053fd31b4c6d (patch) | |
| tree | 5eb53f7e1729ae4bf03e842ae3333e511b1a588d /usr/src/uts/intel | |
| parent | a845c808b8c12dd241b837bd48ae775b26d458fe (diff) | |
| parent | 39fd84a866206a99cbb6b6e63e0c38a367aaa88e (diff) | |
| download | illumos-joyent-31a74c182cf2b5150a704786c53c053fd31b4c6d.tar.gz | |
[illumos-gate merge]
commit 39fd84a866206a99cbb6b6e63e0c38a367aaa88e
6119 mptsas doesn't handle timeouts in mptsas_get_sata_guid()
commit 6d532798b6559eb98b586fd17725d8093f3b9ade
6168 strlcpy() does not return s1
commit 3c9168fa8e9c30d55b3aa2fde74bd7da46df53f5
4053 Add NVME Driver Support to Illumos
commit b08923d6c9c63a4f4b647b84d9454d8124fcedd7
6210 ping can misreport ICMP latency
6211 want warnings in the face of long running name lookups for ping
6212 Want sub-second ping interval support
6213 clean up warnings in ping
commit 0d045c0d0cb001d79480ee33be28514e847f8612
6209 libc mutexes break kernel writers hearts
Conflicts:
usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
usr/src/lib/libc/port/threads/assfail.c
usr/src/uts/common/Makefile.files
usr/src/uts/common/Makefile.rules
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/nvme/Makefile | 73 |
2 files changed, 75 insertions, 1 deletions
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 75ba9472c2..740f0a74a5 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -19,7 +19,7 @@ # # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2014 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2015 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2013 Andrew Stormont. All rights reserved. # Copyright (c) 2015, Joyent, Inc. All rights reserved. @@ -292,6 +292,7 @@ DRV_KMODS += nfp DRV_KMODS += nsmb DRV_KMODS += nulldriver DRV_KMODS += nv_sata +DRV_KMODS += nvme DRV_KMODS += nxge DRV_KMODS += oce DRV_KMODS += openeepr diff --git a/usr/src/uts/intel/nvme/Makefile b/usr/src/uts/intel/nvme/Makefile new file mode 100644 index 0000000000..529d4378a2 --- /dev/null +++ b/usr/src/uts/intel/nvme/Makefile @@ -0,0 +1,73 @@ +# +# CDDL HEADER START +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# CDDL HEADER END +# +# +# Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# + +# +# Paths to the base of the uts directory trees +# +UTSBASE = ../.. + +# +# Define the module and object file sets. +# +MODULE = nvme +OBJECTS = $(NVME_OBJS:%=$(OBJS_DIR)/%) +LINTS = $(NVME_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) +CONF_SRCDIR = $(UTSBASE)/common/io/nvme +# +# Include common rules. +# +include $(UTSBASE)/intel/Makefile.intel + +# +# Define targets +# +ALL_TARGET = $(BINARY) +LINT_TARGET = $(MODULE).lint +INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) + +# +# Driver depends on blkdev +# +LDFLAGS += -dy -N drv/blkdev + +# +# Default build targets. +# +.KEEP_STATE: + +def: $(DEF_DEPS) + +all: $(ALL_DEPS) + +clean: $(CLEAN_DEPS) + +clobber: $(CLOBBER_DEPS) + +lint: $(LINT_DEPS) + +modlintlib: $(MODLINTLIB_DEPS) + +clean.lint: $(CLEAN_LINT_DEPS) + +install: $(INSTALL_DEPS) + +# +# Include common targets. +# +include $(UTSBASE)/intel/Makefile.targ |