diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-02 11:41:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-05-02 11:41:50 +0000 |
| commit | 7aee23a10c59bb8b0a3f41e8b38fa2d7072ae8fa (patch) | |
| tree | d8bfb80066f431c42ee8176bf4ad5775005b7cbb /usr/src/lib | |
| parent | d006a4cbd4e9a251a94eec493f1618a9e452992a (diff) | |
| parent | 545f15ae81ab124ab97b965c15f2873e0228fcb3 (diff) | |
| download | illumos-joyent-7aee23a10c59bb8b0a3f41e8b38fa2d7072ae8fa.tar.gz | |
[illumos-gate merge]
commit 545f15ae81ab124ab97b965c15f2873e0228fcb3
6883 SMF nis/client ipfilter support needs improvement
commit 2bd8b3545dceb97f56401b7ad2a327e08d520574
6881 SMF ipfilter tries to unload module in zones
6882 SMF ipfilter lacks a property for a IPv6 custom policy file
6884 SMF ipfilter tuple_get_port needs to remove backslashes
commit d14b1d19b404dcc4795d8a76751a186717a0ddaa
6934 add kstat to track anon memory reservation failure (ENOMEM)
commit c22cda1b41022b307ea9fda8c9dc19e6329a109a
6847 syscall header declaration incorrect
Conflicts:
usr/src/uts/common/vm/vm_anon.c
usr/src/uts/common/sys/zone.h
usr/src/uts/common/os/zone.c
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libc/sparc/sys/syscall.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libc/sparc/sys/syscall.s b/usr/src/lib/libc/sparc/sys/syscall.s index 70f3618642..41af4eb8d9 100644 --- a/usr/src/lib/libc/sparc/sys/syscall.s +++ b/usr/src/lib/libc/sparc/sys/syscall.s @@ -28,8 +28,8 @@ /* All Rights Reserved */ /* - * C library -- int syscall(int sysnum, ...); - * C library -- int __systemcall(sysret_t *, int sysnum, ...); + * C library -- long syscall(int sysnum, ...); + * C library -- long __systemcall(sysret_t *, int sysnum, ...); * * Interpret a given system call * |