xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'v3.5-rc2' into next

Browse Source
This commit is contained in:
James Morris
2012-06-10 22:52:10 +10:00
parent f52c44cd27 cfaf025112
commit 66dd07b88a
9063 changed files with 533063 additions and 327162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/keys/internal.h
View File

@@ -14,6 +14,7 @@
#include <linux/sched.h>
#include <linux/key-type.h>
#include <linux/task_work.h>
#ifdef __KDEBUG
#define kenter(FMT, ...) \
@@ -148,6 +149,7 @@ extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
#define KEY_LOOKUP_FOR_UNLINK 0x04
extern long join_session_keyring(const char *name);
extern void key_change_session_keyring(struct task_work *twork);
extern struct work_struct key_gc_work;
extern unsigned key_gc_delay;