diff options
Diffstat (limited to 'usr/src/lib/libinstzones')
| -rw-r--r-- | usr/src/lib/libinstzones/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/amd64/Makefile | 30 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/common/zones_locks.c | 8 | ||||
| -rw-r--r-- | usr/src/lib/libinstzones/sparcv9/Makefile | 30 |
4 files changed, 67 insertions, 3 deletions
diff --git a/usr/src/lib/libinstzones/Makefile b/usr/src/lib/libinstzones/Makefile index 12deb8b6c8..85d3363ba1 100644 --- a/usr/src/lib/libinstzones/Makefile +++ b/usr/src/lib/libinstzones/Makefile @@ -20,6 +20,7 @@ # # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Use is subject to license terms. # @@ -32,6 +33,7 @@ HDRDIR = hdrs SUBDIRS = $(MACH) +$(BUILD64)SUBDIRS += $(MACH64) all := TARGET = all install := TARGET = install diff --git a/usr/src/lib/libinstzones/amd64/Makefile b/usr/src/lib/libinstzones/amd64/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libinstzones/amd64/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) diff --git a/usr/src/lib/libinstzones/common/zones_locks.c b/usr/src/lib/libinstzones/common/zones_locks.c index 6352e496bc..5cc1d3bfeb 100644 --- a/usr/src/lib/libinstzones/common/zones_locks.c +++ b/usr/src/lib/libinstzones/common/zones_locks.c @@ -24,7 +24,9 @@ * Use is subject to license terms. */ - +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ /* * Module: zones_locks.c @@ -208,9 +210,9 @@ _z_acquire_lock(char **r_lockKey, char *a_zoneName, char *a_lockObject, if (a_pid > 0) { (void) _z_add_arg(args, "-p"); /* lock valid process i.d. */ - (void) _z_add_arg(args, "%ld", getpid()); + (void) _z_add_arg(args, "%lld", (long long)getpid()); (void) _z_add_arg(args, "-z"); /* lock valid zone i.d. */ - (void) _z_add_arg(args, "%ld", getzoneid()); + (void) _z_add_arg(args, "%lld", (long long)getzoneid()); } /* execute command */ diff --git a/usr/src/lib/libinstzones/sparcv9/Makefile b/usr/src/lib/libinstzones/sparcv9/Makefile new file mode 100644 index 0000000000..5d3fa158a8 --- /dev/null +++ b/usr/src/lib/libinstzones/sparcv9/Makefile @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License, Version 1.0 only +# (the "License"). You may not use this file except in compliance +# with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# +# Copyright 2011 OmniTI Computer Consulting, Inc. All rights reserved. +# Use is subject to license terms. +# + +include ../Makefile.com +include ../../Makefile.lib.64 + +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) |