From e9c48e9ce99977e35d5497f2c2beb1ff73817d43 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 7 Sep 2009 13:24:17 +0100
Subject: [PATCH] --- yaml --- r: 157350 b: refs/heads/master c:
 be1d6a5f55b30042c57bdfbe7cb4761ed081def0 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/security.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44ae5dd9757e..c9a1c50d4fbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d9c25631e7c38dc7be220b04553068fb542683
+refs/heads/master: be1d6a5f55b30042c57bdfbe7cb4761ed081def0
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index f4eb32d5b890..10a09257952b 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -2988,7 +2988,10 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer)
 
 static inline int security_key_session_to_parent(const struct cred *cred,
 						 const struct cred *parent_cred,
-						 struct key *key);
+						 struct key *key)
+{
+	return 0;
+}
 
 #endif
 #endif /* CONFIG_KEYS */