aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Siewior <sebastian@breakpoint.cc>2008-01-08 15:32:47 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-08 16:10:35 -0800
commit5b7741b3325d0d94c88b2ad46657a536890aaa2f (patch)
tree11bc16f7d9991f248652e60ec1ce8d6c528d8d8c
parent9f966be8996f2829406324c68e4c67c2d64d864b (diff)
downloadkernel_samsung_tuna-5b7741b3325d0d94c88b2ad46657a536890aaa2f.zip
kernel_samsung_tuna-5b7741b3325d0d94c88b2ad46657a536890aaa2f.tar.gz
kernel_samsung_tuna-5b7741b3325d0d94c88b2ad46657a536890aaa2f.tar.bz2
KEYS: fix macro
Commit 664cceb0093b755739e56572b836a99104ee8a75 changed the parameters of the function make_key_ref(). The macros that are used in case CONFIG_KEY is not defined did not change. Cc: David Howells <dhowells@redhat.com> Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/key.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/key.h b/include/linux/key.h
index fcdbd5e..a70b8a8 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -290,7 +290,7 @@ extern void key_init(void);
#define key_get(k) ({ NULL; })
#define key_put(k) do { } while(0)
#define key_ref_put(k) do { } while(0)
-#define make_key_ref(k) ({ NULL; })
+#define make_key_ref(k, p) ({ NULL; })
#define key_ref_to_ptr(k) ({ NULL; })
#define is_key_possessed(k) 0
#define alloc_uid_keyring(u,c) 0