From 5ede9bf2dd4a03cc0682e76a1af4e5878da8f63b Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 18 Jan 2011 09:07:12 -0500
Subject: [PATCH] --- yaml --- r: 232263 b: refs/heads/master c:
 b9703449347603289cac0bd04e574ac2e777275d h: refs/heads/master i:   232261:
 53510975ab7ffacf6a421697b816321b5a5156dd   232259:
 467eb6b881ce64704871e4a86ac54eb687529eef   232255:
 54b51ee8ac342d576590b3409b073586a0f268b2 v: v3

---
 [refs]                                                   | 2 +-
 trunk/security/keys/Makefile                             | 2 +-
 trunk/security/keys/{encrypted_defined.c => encrypted.c} | 3 ++-
 trunk/security/keys/{encrypted_defined.h => encrypted.h} | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename trunk/security/keys/{encrypted_defined.c => encrypted.c} (99%)
 rename trunk/security/keys/{encrypted_defined.h => encrypted.h} (100%)

diff --git a/[refs] b/[refs]
index 119757b2ef72..5544d68488be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b174b6d281f5c87234fc65bafc02877f565c5cf
+refs/heads/master: b9703449347603289cac0bd04e574ac2e777275d
diff --git a/trunk/security/keys/Makefile b/trunk/security/keys/Makefile
index ad8da87653cf..1bf090a885fe 100644
--- a/trunk/security/keys/Makefile
+++ b/trunk/security/keys/Makefile
@@ -14,7 +14,7 @@ obj-y := \
 	user_defined.o
 
 obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
-obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o
diff --git a/trunk/security/keys/encrypted_defined.c b/trunk/security/keys/encrypted.c
similarity index 99%
rename from trunk/security/keys/encrypted_defined.c
rename to trunk/security/keys/encrypted.c
index 28791a65740e..9e7e4ce3fae8 100644
--- a/trunk/security/keys/encrypted_defined.c
+++ b/trunk/security/keys/encrypted.c
@@ -30,7 +30,7 @@
 #include <crypto/sha.h>
 #include <crypto/aes.h>
 
-#include "encrypted_defined.h"
+#include "encrypted.h"
 
 static const char KEY_TRUSTED_PREFIX[] = "trusted:";
 static const char KEY_USER_PREFIX[] = "user:";
@@ -888,6 +888,7 @@ static int __init init_encrypted(void)
 out:
 	encrypted_shash_release();
 	return ret;
+
 }
 
 static void __exit cleanup_encrypted(void)
diff --git a/trunk/security/keys/encrypted_defined.h b/trunk/security/keys/encrypted.h
similarity index 100%
rename from trunk/security/keys/encrypted_defined.h
rename to trunk/security/keys/encrypted.h