The patch titled
security/selinux/hooks.c: make 4 functions static
has been removed from the -mm tree. Its filename is
security-selinux-hooksc-make-4-functions-static.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: security/selinux/hooks.c: make 4 functions static
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch makes four needlessly global functions static.
(akpm: applicable to the selinux updates in net-2.6.19.git)
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: James Morris <jmorris@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
security/selinux/hooks.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff -puN security/selinux/hooks.c~security-selinux-hooksc-make-4-functions-static security/selinux/hooks.c
--- a/security/selinux/hooks.c~security-selinux-hooksc-make-4-functions-static
+++ a/security/selinux/hooks.c
@@ -3598,7 +3598,7 @@ static void selinux_sk_getsecid(struct s
}
}
-void selinux_sock_graft(struct sock* sk, struct socket *parent)
+static void selinux_sock_graft(struct sock* sk, struct socket *parent)
{
struct inode_security_struct *isec = SOCK_INODE(parent)->i_security;
struct sk_security_struct *sksec = sk->sk_security;
@@ -3608,8 +3608,8 @@ void selinux_sock_graft(struct sock* sk,
selinux_netlbl_sock_graft(sk, parent);
}
-int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb,
- struct request_sock *req)
+static int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb,
+ struct request_sock *req)
{
struct sk_security_struct *sksec = sk->sk_security;
int err;
@@ -3638,7 +3638,8 @@ int selinux_inet_conn_request(struct soc
return 0;
}
-void selinux_inet_csk_clone(struct sock *newsk, const struct request_sock *req)
+static void selinux_inet_csk_clone(struct sock *newsk,
+ const struct request_sock *req)
{
struct sk_security_struct *newsksec = newsk->sk_security;
@@ -3649,7 +3650,8 @@ void selinux_inet_csk_clone(struct sock
time it will have been created and available. */
}
-void selinux_req_classify_flow(const struct request_sock *req, struct flowi *fl)
+static void selinux_req_classify_flow(const struct request_sock *req,
+ struct flowi *fl)
{
fl->secid = req->secid;
}
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
git-cpufreq.patch
git-drm.patch
git-dvb.patch
git-gfs2.patch
the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch
git-input.patch
git-libata-all.patch
git-mtd.patch
git-net.patch
fs-nfs-make-code-static.patch
git-pcmcia.patch
include-scsi-libsash-should-include-linux-scatterlisth.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-misc.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-cryptodev.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
add-force-of-use-mmconfig.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
drivers-char-scx200_gpioc-make-code-static.patch
drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch
kernel-time-ntpc-possible-cleanups.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
generic-ioremap_page_range-i386-conversion-fix.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack-fix.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-cleanups.patch
md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
schedule-obsolete-oss-drivers-for-removal-2nd-round.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
