Merge branch 'asoc-omap' into for-3.7

1 files changed, 3 insertions, 1 deletions

diff --git a/include/net/scm.h b/include/net/scm.h
index 079d7887dac1..7dc0854f0b38 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -70,9 +70,11 @@ static __inline__ void scm_destroy(struct scm_cookie *scm)
 }
 
 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
-                               struct scm_cookie *scm)
+                               struct scm_cookie *scm, bool forcecreds)
 {
         memset(scm, 0, sizeof(*scm));
+        if (forcecreds)
+                scm_set_cred(scm, task_tgid(current), current_cred());
         unix_get_peersec_dgram(sock, scm);
         if (msg->msg_controllen <= 0)
                 return 0;