diff --git a/[refs] b/[refs] index a315b8f9c713..59954367e981 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f966be8996f2829406324c68e4c67c2d64d864b +refs/heads/master: 5b7741b3325d0d94c88b2ad46657a536890aaa2f diff --git a/trunk/include/linux/key.h b/trunk/include/linux/key.h index fcdbd5ed227b..a70b8a8f2005 100644 --- a/trunk/include/linux/key.h +++ b/trunk/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