diff options
Diffstat (limited to 'usr/src/uts/sparc')
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc | 5 | ||||
| -rw-r--r-- | usr/src/uts/sparc/datafilt/Makefile | 73 | ||||
| -rw-r--r-- | usr/src/uts/sparc/inotify/Makefile | 70 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ipf/ipf.global-objs.debug64 | 4 | ||||
| -rw-r--r-- | usr/src/uts/sparc/syscall/getcontext.c | 31 | ||||
| -rw-r--r-- | usr/src/uts/sparc/zfd/Makefile | 50 | 
6 files changed, 223 insertions, 10 deletions
| diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc index abea00c625..4fd54a12ef 100644 --- a/usr/src/uts/sparc/Makefile.sparc +++ b/usr/src/uts/sparc/Makefile.sparc @@ -219,7 +219,7 @@ 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	+= spdsock -DRV_KMODS	+= tcp tcp6 timerfd tl tnf ttymux udp udp6 wc winlock zcons +DRV_KMODS	+= tcp tcp6 timerfd tl tnf ttymux udp udp6 wc winlock zcons zfd  DRV_KMODS	+= ippctl  DRV_KMODS	+= dld  DRV_KMODS	+= ipd @@ -239,8 +239,10 @@ DRV_KMODS	+= nulldriver  DRV_KMODS	+= bridge trill  DRV_KMODS	+= bpf  DRV_KMODS	+= dca +DRV_KMODS	+= inotify  DRV_KMODS	+= eventfd  DRV_KMODS	+= signalfd +DRV_KMODS	+= timerfd  #  #       Hardware Drivers in common space @@ -494,6 +496,7 @@ SOCKET_KMODS	+= socksctp  SOCKET_KMODS	+= socksdp  SOCKET_KMODS	+= sockrds  SOCKET_KMODS	+= ksslf +SOCKET_KMODS	+= datafilt  #  #	kiconv modules (/kernel/kiconv): diff --git a/usr/src/uts/sparc/datafilt/Makefile b/usr/src/uts/sparc/datafilt/Makefile new file mode 100644 index 0000000000..80969500ef --- /dev/null +++ b/usr/src/uts/sparc/datafilt/Makefile @@ -0,0 +1,73 @@ +# +# 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. +# + +# +# Copyright (c) 2011, OmniTI Computer Consulting, Inc. All rights reserved. +# Copyright 2012, Nexenta Systems, Inc. All rights reserved. +# + +# +#	Path to the base of the uts directory tree (usually /usr/src/uts). +# +UTSBASE	= ../.. + +# +#	Define the module and object file sets. +# +MODULE		= datafilt +OBJECTS		= $(DATAFILT_OBJS:%=$(OBJS_DIR)/%) +LINTS		= $(DATAFILT_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE	= $(ROOT_SOCK_DIR)/$(MODULE) + +# +#	Include common rules. +# +include $(UTSBASE)/sparc/Makefile.sparc + +# +#	Define targets +# +ALL_TARGET	= $(BINARY) +LINT_TARGET	= $(MODULE).lint +INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) + +# +# lint pass one enforcement and OS version +# +CFLAGS += $(CCVERBOSE) + +LDFLAGS += -dy -Nfs/sockfs -Ndrv/ip + +# +#	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)/sparc/Makefile.targ diff --git a/usr/src/uts/sparc/inotify/Makefile b/usr/src/uts/sparc/inotify/Makefile new file mode 100644 index 0000000000..ce2b956955 --- /dev/null +++ b/usr/src/uts/sparc/inotify/Makefile @@ -0,0 +1,70 @@ +# +# 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. +# + +# +# Copyright (c) 2014 Joyent, Inc.  All rights reserved. +# + +# +#	Path to the base of the uts directory tree (usually /usr/src/uts). +# +UTSBASE	= ../.. + +# +#	Define the module and object file sets. +# +MODULE		= inotify +OBJECTS		= $(INOTIFY_OBJS:%=$(OBJS_DIR)/%) +LINTS		= $(INOTIFY_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE	= $(USR_DRV_DIR)/$(MODULE) +CONF_SRCDIR	= $(UTSBASE)/common/io + +# +#	Include common rules. +# +include $(UTSBASE)/sparc/Makefile.sparc + +LINTTAGS	+= -erroff=E_STRUCT_DERIVED_FROM_FLEX_MBR +CERRWARN	+= -_gcc=-Wno-parentheses +LDFLAGS		+= -dy -Nfs/specfs + +# +#	Define targets +# +ALL_TARGET	= $(BINARY) $(SRC_CONFILE) +LINT_TARGET	= $(MODULE).lint +INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) + +# +#	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)/sparc/Makefile.targ diff --git a/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 b/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 index 663613cee3..cb3e5485b2 100644 --- a/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 +++ b/usr/src/uts/sparc/ipf/ipf.global-objs.debug64 @@ -25,6 +25,10 @@  # Copyright 2013 Joyent, Inc. All rights reserved  # +hook4_vnd_in +hook4_vnd_out +hook6_vnd_in +hook6_vnd_out  fr_availfuncs  fr_features  fr_objbytes diff --git a/usr/src/uts/sparc/syscall/getcontext.c b/usr/src/uts/sparc/syscall/getcontext.c index c9adb54b86..3c8dbf9190 100644 --- a/usr/src/uts/sparc/syscall/getcontext.c +++ b/usr/src/uts/sparc/syscall/getcontext.c @@ -20,6 +20,9 @@   */  /* + * Copyright 2015 Joyent, Inc. + */ +/*   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.   * Use is subject to license terms.   */ @@ -110,10 +113,15 @@ savecontext(ucontext_t *ucp, const k_sigset_t *mask)  		ucp->uc_flags &= ~UC_FPU;  	ucp->uc_mcontext.gwins = (gwindows_t *)NULL; -	/* -	 * Save signal mask. -	 */ -	sigktou(mask, &ucp->uc_sigmask); +	if (mask != NULL) { +		/* +		 * Save signal mask. +		 */ +		sigktou(mask, &ucp->uc_sigmask); +	} else { +		ucp->uc_flags &= ~UC_SIGMASK; +		bzero(&ucp->uc_sigmask, sizeof (ucp->uc_sigmask)); +	}  } @@ -412,11 +420,16 @@ savecontext32(ucontext32_t *ucp, const k_sigset_t *mask, struct fq32 *dfq)  		ucp->uc_flags &= ~UC_FPU;  	ucp->uc_mcontext.gwins = (caddr32_t)NULL; -	/* -	 * Save signal mask (the 32- and 64-bit sigset_t structures are -	 * identical). -	 */ -	sigktou(mask, (sigset_t *)&ucp->uc_sigmask); +	if (mask != NULL) { +		/* +		 * Save signal mask (the 32- and 64-bit sigset_t structures are +		 * identical). +		 */ +		sigktou(mask, (sigset_t *)&ucp->uc_sigmask); +	} else { +		ucp->uc_flags &= ~UC_SIGMASK; +		bzero(&ucp->uc_sigmask, sizeof (ucp->uc_sigmask)); +	}  }  int diff --git a/usr/src/uts/sparc/zfd/Makefile b/usr/src/uts/sparc/zfd/Makefile new file mode 100644 index 0000000000..ebdba686b4 --- /dev/null +++ b/usr/src/uts/sparc/zfd/Makefile @@ -0,0 +1,50 @@ +# +# 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. +# + +# +# Copyright 2014 Joyent, Inc.  All rights reserved. +# +# uts/intel/zfd/Makefile + +UTSBASE	= ../.. + +MODULE		= zfd +OBJECTS		= $(ZFD_OBJS:%=$(OBJS_DIR)/%) +LINTS		= $(ZFD_OBJS:%.o=$(LINTS_DIR)/%.ln) +ROOTMODULE	= $(USR_DRV_DIR)/$(MODULE) + +include $(UTSBASE)/sparc/Makefile.sparc + +ALL_TARGET	= $(BINARY) +LINT_TARGET	= $(MODULE).lint +INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) + +CFLAGS		+= $(CCVERBOSE) + +.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 $(UTSBASE)/sparc/Makefile.targ | 
