The patch titled
security/slim/slm_main.c: make 2 functions static
has been added to the -mm tree. Its filename is
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: security/slim/slm_main.c: make 2 functions static
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch makes two needlessly global functions static.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Kylene Hall <kjhall@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
security/slim/slm_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN security/slim/slm_main.c~slim-main-patch-security-slim-slm_mainc-make-2-functions-static security/slim/slm_main.c
--- a/security/slim/slm_main.c~slim-main-patch-security-slim-slm_mainc-make-2-functions-static
+++ a/security/slim/slm_main.c
@@ -819,8 +819,8 @@ static int slm_inode_rename(struct inode
* of the current process. This is especially important for objects
* being promoted.
*/
-int slm_inode_setxattr(struct dentry *dentry, char *name, void *value,
- size_t size, int flags)
+static int slm_inode_setxattr(struct dentry *dentry, char *name, void *value,
+ size_t size, int flags)
{
struct slm_tsec_data *cur_tsec = current->security;
char *data = value;
@@ -923,7 +923,7 @@ static int slm_inode_alloc_security(stru
/*
* Opening a socket demotes the integrity of a process to untrusted.
*/
-int slm_socket_create(int family, int type, int protocol, int kern)
+static int slm_socket_create(int family, int type, int protocol, int kern)
{
struct task_struct *parent_tsk;
struct slm_tsec_data *cur_tsec = current->security, *parent_tsec;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
make-drivers-acpi-baycdrive_bays-static.patch
git-alsa.patch
tidy-gregkh-driver-udev-compatible-hack.patch
drivers-media-video-cafe_ccicc-make-a-function-static.patch
git-gfs2-nmw.patch
git-mtd.patch
git-net.patch
net-uninline-skb_put-fix.patch
git-pcmcia.patch
git-scsi-misc.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-dpt_i2oc-remove-dead-code.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
ext4_ext_split-remove-dead-code.patch
the-scheduled-removal-of-some-oss-options.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
gtod-persistent-clock-support-i386-i386-unexport-read_persistent_clock.patch
updated-i386-convert-to-clock-event-devices-arch-i386-kernel-apicc-make-a-function-static.patch
updated-i386-convert-to-clock-event-devices-remove-arch-i386-kernel-time_hpetchpet_reenable.patch
slim-main-patch-security-slim-slm_mainc-make-2-functions-static.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.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
