From c6771133a42642092f94df8452f67edd5baba331 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 18 Jan 2012 10:04:29 +0000
Subject: [PATCH] --- yaml --- r: 286541 b: refs/heads/master c:
 456a8167e94b66f406c27400a46a707b870452b0 h: refs/heads/master i:   286539:
 ccfbb4433365ba195a4c1a274bcd1547c6df8fee v: v3

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

diff --git a/[refs] b/[refs]
index 4b349ec3cc43..78de1212ae14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b24579d099ebb67f39cd7924a72a7eec0ce6ae
+refs/heads/master: 456a8167e94b66f406c27400a46a707b870452b0
diff --git a/trunk/include/linux/key.h b/trunk/include/linux/key.h
index bfc014c57351..5253471cd2ea 100644
--- a/trunk/include/linux/key.h
+++ b/trunk/include/linux/key.h
@@ -271,7 +271,7 @@ extern int keyring_add_key(struct key *keyring,
 
 extern struct key *key_lookup(key_serial_t id);
 
-static inline key_serial_t key_serial(struct key *key)
+static inline key_serial_t key_serial(const struct key *key)
 {
 	return key ? key->serial : 0;
 }