From owner-svn-src-stable@FreeBSD.ORG  Wed Jun  3 11:36:48 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C869F774;
 Wed,  3 Jun 2015 11:36:48 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B613819D2;
 Wed,  3 Jun 2015 11:36:48 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t53Bamrs094883;
 Wed, 3 Jun 2015 11:36:48 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t53Bamfg094882;
 Wed, 3 Jun 2015 11:36:48 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201506031136.t53Bamfg094882@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 3 Jun 2015 11:36:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283940 - stable/10/sys/kern
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jun 2015 11:36:48 -0000

Author: emaste
Date: Wed Jun  3 11:36:47 2015
New Revision: 283940
URL: https://svnweb.freebsd.org/changeset/base/283940

Log:
  MFC r257736 (by pjd):
  
    - Remove mac_get_fd/mac_set_fd - those are not syscalls. The
      __mac_get_fd() and __mac_set_fd() syscalls are listed earlier.
    - Correct typo in syscall name. It should be sched_rr_get_interval,
      not sched_rr_getinterval.

Modified:
  stable/10/sys/kern/capabilities.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/capabilities.conf
==============================================================================
--- stable/10/sys/kern/capabilities.conf	Wed Jun  3 10:10:00 2015	(r283939)
+++ stable/10/sys/kern/capabilities.conf	Wed Jun  3 11:36:47 2015	(r283940)
@@ -386,13 +386,6 @@ listen
 lseek
 
 ##
-## Allow MAC label operations by file descriptor, subject to capability
-## rights.
-##
-mac_get_fd
-mac_set_fd
-
-##
 ## Allow simple VM operations on the current process.
 ##
 madvise
@@ -552,7 +545,7 @@ sched_get_priority_min
 ##
 sched_getparam
 sched_getscheduler
-sched_rr_getinterval
+sched_rr_get_interval
 sched_setparam
 sched_setscheduler
 sched_yield