---

yaml --- r: 309815 b: refs/heads/master c: dea649b h: refs/heads/master i: 309813: ef5c814 309811: 84c0409 309807: 5c959db v: v3
git-mirror · May 24, 2012 · 16a70fe · 16a70fe
1 parent 4f96aab
commit 16a70fe
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 413cd3d9abeaef590e5ce00564f7a443165db238
+refs/heads/master: dea649b8ac1861107c5d91e1a71121434fc64193
diff --git a/trunk/include/linux/key.h b/trunk/include/linux/key.h
@@ -33,8 +33,6 @@ typedef uint32_t key_perm_t;
 
 struct key;
 
-#define key_replace_session_keyring()	do { } while (0)
-
 #ifdef CONFIG_KEYS
 
 #undef KEY_DEBUGGING

diff --git a/trunk/include/linux/tracehook.h b/trunk/include/linux/tracehook.h
@@ -186,8 +186,6 @@ static inline void set_notify_resume(struct task_struct *task)
  */
 static inline void tracehook_notify_resume(struct pt_regs *regs)
 {
-	if (current->replacement_session_keyring)
-		key_replace_session_keyring();
 	/*
 	 * The caller just cleared TIF_NOTIFY_RESUME. This barrier
 	 * pairs with task_work_add()->set_notify_resume() after