From owner-p4-projects@FreeBSD.ORG Sat Dec 1 21:33:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C534616A421; Sat, 1 Dec 2007 21:33:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D0DB16A418 for ; Sat, 1 Dec 2007 21:33:07 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6433C13C46B for ; Sat, 1 Dec 2007 21:33:07 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB1LX79H074814 for ; Sat, 1 Dec 2007 21:33:07 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB1LX7uT074811 for perforce@freebsd.org; Sat, 1 Dec 2007 21:33:07 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Dec 2007 21:33:07 GMT Message-Id: <200712012133.lB1LX7uT074811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 129901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2007 21:33:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=129901 Change 129901 by peter@peter_daintree on 2007/12/01 21:32:31 oops. fix mismerge. s/MSTD/STD/ Affected files ... .. //depot/projects/bike_sched/sys/kern/syscalls.master#7 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/syscalls.master#7 (text+ko) ==== @@ -669,9 +669,9 @@ 381 AUE_NULL UNIMPL kse_create 382 AUE_NULL UNIMPL kse_thr_interrupt 383 AUE_NULL UNIMPL kse_release -384 AUE_NULL MSTD { int __mac_get_proc(struct mac *mac_p); } -385 AUE_NULL MSTD { int __mac_set_proc(struct mac *mac_p); } -386 AUE_NULL MSTD { int __mac_get_fd(int fd, \ +384 AUE_NULL STD { int __mac_get_proc(struct mac *mac_p); } +385 AUE_NULL STD { int __mac_set_proc(struct mac *mac_p); } +386 AUE_NULL STD { int __mac_get_fd(int fd, \ struct mac *mac_p); } 387 AUE_NULL STD { int __mac_get_file(const char *path_p, \ struct mac *mac_p); }