- smack-make-smk_cipso_doi-and-smk_unlbl_ambient.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     smack: make smk_cipso_doi() and smk_unlbl_ambient()
has been removed from the -mm tree.  Its filename was
     smack-make-smk_cipso_doi-and-smk_unlbl_ambient.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: smack: make smk_cipso_doi() and smk_unlbl_ambient()
From: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>

The functions smk_cipso_doi and smk_unlbl_ambient are not used outside
smackfs.c and should hence be static.

Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 security/smack/smackfs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN security/smack/smackfs.c~smack-make-smk_cipso_doi-and-smk_unlbl_ambient security/smack/smackfs.c
--- a/security/smack/smackfs.c~smack-make-smk_cipso_doi-and-smk_unlbl_ambient
+++ a/security/smack/smackfs.c
@@ -317,7 +317,7 @@ static const struct file_operations smk_
 /**
  * smk_cipso_doi - initialize the CIPSO domain
  */
-void smk_cipso_doi(void)
+static void smk_cipso_doi(void)
 {
 	int rc;
 	struct cipso_v4_doi *doip;
@@ -350,7 +350,7 @@ void smk_cipso_doi(void)
 /**
  * smk_unlbl_ambient - initialize the unlabeled domain
  */
-void smk_unlbl_ambient(char *oldambient)
+static void smk_unlbl_ambient(char *oldambient)
 {
 	int rc;
 	struct netlbl_audit audit_info;
_

Patches currently in -mm which might be from casey@xxxxxxxxxxxxxxxx are

origin.patch
nfs-lsm-make-nfsv4-set-lsm-mount-options.patch
signals-cleanup-security_task_kill-usage-implementation.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux