From 998baf39ffcc73380fa08dec9abb8cf1173bec4e Mon Sep 17 00:00:00 2001
From: Chihau Chau <chihau@gmail.com>
Date: Mon, 8 Mar 2010 20:11:34 -0300
Subject: [PATCH] --- yaml --- r: 192398 b: refs/heads/master c:
 512ea3bc30c0e052a961e1abce8e783f3e28c92a h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/security/keys/keyring.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c4ff32a1b669..dace3ca7aa70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c43a7523470dc2d9947fa114a0b54317975d4c04
+refs/heads/master: 512ea3bc30c0e052a961e1abce8e783f3e28c92a
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
index a98fb376f249..fe0763a18c17 100644
--- a/trunk/security/keys/keyring.c
+++ b/trunk/security/keys/keyring.c
@@ -17,7 +17,7 @@
 #include <linux/seq_file.h>
 #include <linux/err.h>
 #include <keys/keyring-type.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include "internal.h"
 
 /*
@@ -304,7 +304,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
 	key_check(keyring);
 
 	/* top keyring must have search permission to begin the search */
-        err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
+	err = key_task_permission(keyring_ref, cred, KEY_SEARCH);
 	if (err < 0) {
 		key_ref = ERR_PTR(err);
 		goto error;
@@ -773,8 +773,7 @@ int __key_link(struct key *keyring, struct key *key)
 		smp_wmb();
 		klist->nkeys++;
 		smp_wmb();
-	}
-	else {
+	} else {
 		/* grow the key list */
 		max = 4;
 		if (klist)