From: John Hughes Date: Tue, 27 Mar 2001 13:57:48 +0000 (+0000) Subject: Fix bad merge of solaris patch X-Git-Tag: v4.5.18~1071 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e075fbbda35fd04367d7361c23615e7c6198f09;p=strace Fix bad merge of solaris patch --- diff --git a/ChangeLog b/ChangeLog index eae2810a..1d8c272c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-27 John Hughes + + * svr4/syscallent.h: ntp_adjtime entry was duplicated on Solaris + systems - bad merge of Harald Boehme's patch by me. + 2001-03-19 Wichert Akkerman * linux/mips/syscallent.h: we can't have -1 nargs, change to 0 diff --git a/svr4/syscallent.h b/svr4/syscallent.h index 19f177f2..0ffe16b9 100644 --- a/svr4/syscallent.h +++ b/svr4/syscallent.h @@ -639,7 +639,6 @@ { -1, TN, sys_sockconfig, "sockconfig" }, /* 247 */ { -1, 0, sys_ntp_gettime, "ntp_gettime" }, /* 248 */ { -1, 0, sys_ntp_adjtime, "ntp_adjtime" }, /* 249 */ - { -1, 0, sys_ntp_adjtime, "ntp_adjtime" }, /* 249 */ { -1, 0, printargs, "lwp_mutex_unlock" }, /* 250 */ { -1, 0, printargs, "lwp_mutex_trylock" }, /* 251 */ { -1, 0, printargs, "lwp_mutex_init" }, /* 252 */