Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / security / dummy.c

diff --git a/security/dummy.c b/security/dummy.c
index 27fa13b..05d9885 100644 (file)
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -688,7 +688,7 @@ static int dummy_shm_shmctl (struct shmid_kernel *shp, int cmd)
        return 0;
 }
 
-static int dummy_shm_shmat (struct shmid_kernel *shp, char *shmaddr,
+static int dummy_shm_shmat (struct shmid_kernel *shp, char __user *shmaddr,
                            int shmflg)
 {
        return 0;
@@ -720,7 +720,7 @@ static int dummy_sem_semop (struct sem_array *sma,
        return 0;
 }
 
-static int dummy_netlink_send (struct sk_buff *skb)
+static int dummy_netlink_send (struct sock *sk, struct sk_buff *skb)
 {
        if (current->euid == 0)
                cap_raise (NETLINK_CB (skb).eff_cap, CAP_NET_ADMIN);