diff options
Diffstat (limited to 'usr/src/uts/common/os')
| -rw-r--r-- | usr/src/uts/common/os/flock.c | 14 | ||||
| -rw-r--r-- | usr/src/uts/common/os/sig.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/os/swapgeneric.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/os/sysent.c | 19 |
4 files changed, 0 insertions, 41 deletions
diff --git a/usr/src/uts/common/os/flock.c b/usr/src/uts/common/os/flock.c index da81003d1c..4cb6ea8d82 100644 --- a/usr/src/uts/common/os/flock.c +++ b/usr/src/uts/common/os/flock.c @@ -18,7 +18,6 @@ * * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -28,8 +27,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/flock_impl.h> #include <sys/vfs.h> #include <sys/t_lock.h> /* for <sys/callb.h> */ @@ -609,7 +606,6 @@ flk_add_callback(flk_callback_t *newcb, cblist->cb_prev->cb_next = newcb; cblist->cb_prev = newcb; } -/* ONC_PLUS EXTRACT END */ /* * Initialize the flk_edge_cache data structure and create the @@ -984,7 +980,6 @@ block: } } -/* ONC_PLUS EXTRACT START */ /* * The actual execution of the request in the simple case is only to * insert the 'request' in the list of active locks if it is not an @@ -1043,7 +1038,6 @@ flk_execute_request(lock_descriptor_t *request) return (0); } -/* ONC_PLUS EXTRACT END */ /* * 'request' is blocked by some one therefore we put it into sleep queue. @@ -2243,7 +2237,6 @@ done: return (result); } -/* ONC_PLUS EXTRACT START */ /* * Determine whether there are any locks for the given vnode with a remote * sysid. Returns zero if not, non-zero if there are. @@ -2614,7 +2607,6 @@ cleanlocks(vnode_t *vp, pid_t pid, int sysid) CHECK_OWNER_LOCKS(gp, pid, sysid, vp); mutex_exit(&gp->gp_mutex); } -/* ONC_PLUS EXTRACT END */ /* @@ -2653,7 +2645,6 @@ chklock( return (error); } -/* ONC_PLUS EXTRACT START */ /* * convoff - converts the given data (start, whence) to the * given whence. @@ -2706,7 +2697,6 @@ convoff(vp, lckdat, whence, offset) lckdat->l_whence = (short)whence; return (0); } -/* ONC_PLUS EXTRACT END */ /* proc_graph function definitions */ @@ -3070,7 +3060,6 @@ add: mutex_exit(&flock_lock); } -/* ONC_PLUS EXTRACT START */ /* * Set the control status for lock manager requests. * @@ -3692,7 +3681,6 @@ unlock_lockmgr_granted(struct flock_globals *fg) mutex_exit(&gp->gp_mutex); } } -/* ONC_PLUS EXTRACT END */ /* @@ -3715,7 +3703,6 @@ wait_for_lock(lock_descriptor_t *request) } } -/* ONC_PLUS EXTRACT START */ /* * Create an flock structure from the existing lock information * @@ -3870,7 +3857,6 @@ report_blocker(lock_descriptor_t *blocker, lock_descriptor_t *request) } } } -/* ONC_PLUS EXTRACT END */ /* * PSARC case 1997/292 diff --git a/usr/src/uts/common/os/sig.c b/usr/src/uts/common/os/sig.c index 4bad31d2cb..d3ce92fe24 100644 --- a/usr/src/uts/common/os/sig.c +++ b/usr/src/uts/common/os/sig.c @@ -2227,7 +2227,6 @@ sigcheck(proc_t *p, kthread_t *t) #endif } -/* ONC_PLUS EXTRACT START */ void sigintr(k_sigset_t *smask, int intable) { @@ -2304,7 +2303,6 @@ sigintr(k_sigset_t *smask, int intable) lwp->lwp_nostop++; } -/* ONC_PLUS EXTRACT END */ void sigunintr(k_sigset_t *smask) diff --git a/usr/src/uts/common/os/swapgeneric.c b/usr/src/uts/common/os/swapgeneric.c index 18ce39949a..bfb6ccc05e 100644 --- a/usr/src/uts/common/os/swapgeneric.c +++ b/usr/src/uts/common/os/swapgeneric.c @@ -18,11 +18,9 @@ * * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright (c) 1982, 2010, Oracle and/or its affiliates. All rights reserved. */ -/* ONC_PLUS EXTRACT END */ /* * Configure root, swap and dump devices. @@ -326,7 +324,6 @@ preload_module(struct sysparam *sysp, void *p) return (0); } -/* ONC_PLUS EXTRACT START */ /* * We want to load all the modules needed to mount the root filesystem, * so that when we start the ball rolling in 'getrootdev', every module @@ -340,7 +337,6 @@ loadrootmodules(void) char *this; char *name; int err; -/* ONC_PLUS EXTRACT END */ int i, proplen; extern char *impl_module_list[]; extern char *platform_module_list[]; @@ -483,7 +479,6 @@ loop: BMDPRINTF(("loadrootmodules: preload_module\n")); (void) mod_sysctl_type(MOD_FORCELOAD, preload_module, NULL); -/* ONC_PLUS EXTRACT START */ /* * If we booted otw then load in the plumbing * routine now while we still can. If we didn't @@ -582,7 +577,6 @@ out: return (err); } -/* ONC_PLUS EXTRACT END */ static int get_bootpath_prop(char *bootpath) diff --git a/usr/src/uts/common/os/sysent.c b/usr/src/uts/common/os/sysent.c index bf62a79268..e3965f7d82 100644 --- a/usr/src/uts/common/os/sysent.c +++ b/usr/src/uts/common/os/sysent.c @@ -19,8 +19,6 @@ * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ - /* * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. @@ -30,8 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -/* ONC_PLUS EXTRACT END */ - #include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> @@ -53,7 +49,6 @@ struct hrtsysa; struct mmaplf32a; -/* ONC_PLUS EXTRACT START */ /* * This table is the switch used to transfer to the appropriate * routine for processing a system call. Each row contains the @@ -61,7 +56,6 @@ struct mmaplf32a; * in trap.c whether a setjmp() is not necessary, and a pointer * to the routine. */ -/* ONC_PLUS EXTRACT END */ int access(char *, int); int alarm(int); @@ -422,7 +416,6 @@ typedef int64_t (*llfcn_t)(); /* for casting one-word returns */ */ #define SYSENT_LOADABLE() \ { 0, SE_LOADABLE, (int (*)())nosys, NULL, loadable_syscall } -/* ONC_PLUS EXTRACT END */ /* * Initialization macro for loadable 32-bit compatibility system calls. @@ -433,13 +426,11 @@ typedef int64_t (*llfcn_t)(); /* for casting one-word returns */ struct sysent nosys_ent = SYSENT_NOSYS(); -/* ONC_PLUS EXTRACT START */ /* * Native sysent table. */ struct sysent sysent[NSYSCALL] = { -/* ONC_PLUS EXTRACT END */ /* 0 */ IF_LP64( SYSENT_NOSYS(), SYSENT_C("indir", indir, 1)), @@ -564,9 +555,7 @@ struct sysent sysent[NSYSCALL] = /* 103 */ SYSENT_CI("statvfs", statvfs, 2), /* 104 */ SYSENT_CI("fstatvfs", fstatvfs, 2), /* 105 */ SYSENT_CI("getloadavg", getloadavg, 2), -/* ONC_PLUS EXTRACT START */ /* 106 */ SYSENT_LOADABLE(), /* nfssys */ -/* ONC_PLUS EXTRACT END */ /* 107 */ SYSENT_CI("waitsys", waitsys, 4), /* 108 */ SYSENT_CI("sigsendset", sigsendsys, 2), /* 109 */ IF_x86( @@ -765,9 +754,7 @@ struct sysent sysent[NSYSCALL] = /* 253 */ SYSENT_CI("cladm", cladm, 3), /* 254 */ SYSENT_CI("uucopy", uucopy, 3), /* 255 */ SYSENT_CI("umount2", umount2, 2) -/* ONC_PLUS EXTRACT START */ }; -/* ONC_PLUS EXTRACT END */ #ifdef _SYSCALL32_IMPL @@ -821,14 +808,12 @@ extern ssize_t sendto32(int32_t, caddr32_t, size32_t, int32_t, caddr32_t, extern int privsys32(int, priv_op_t, priv_ptype_t, caddr32_t, size32_t, int); extern int ucredsys32(int, int, caddr32_t); -/* ONC_PLUS EXTRACT START */ /* * sysent table for ILP32 processes running on * a LP64 kernel. */ struct sysent sysent32[NSYSCALL] = { -/* ONC_PLUS EXTRACT END */ /* 0 */ SYSENT_C("indir", indir, 1), /* 1 */ SYSENT_CI("exit", (int (*)())rexit, 1), /* 2 */ SYSENT_LOADABLE32(), /* (was forkall) */ @@ -937,9 +922,7 @@ struct sysent sysent32[NSYSCALL] = /* 103 */ SYSENT_CI("statvfs", statvfs32, 2), /* 104 */ SYSENT_CI("fstatvfs", fstatvfs32, 2), /* 105 */ SYSENT_CI("getloadavg", getloadavg, 2), -/* ONC_PLUS EXTRACT START */ /* 106 */ SYSENT_LOADABLE32(), /* nfssys */ -/* ONC_PLUS EXTRACT END */ /* 107 */ SYSENT_CI("waitsys", waitsys32, 4), /* 108 */ SYSENT_CI("sigsendset", sigsendsys, 2), /* 109 */ IF_x86( @@ -1096,9 +1079,7 @@ struct sysent sysent32[NSYSCALL] = /* 253 */ SYSENT_CI("cladm", cladm, 3), /* 254 */ SYSENT_CI("uucopy", uucopy, 3), /* 255 */ SYSENT_CI("umount2", umount2, 2) -/* ONC_PLUS EXTRACT START */ }; -/* ONC_PLUS EXTRACT END */ #endif /* _SYSCALL32_IMPL */ /* |