Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 84c51e177269..2e992bc8015b 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/percpu.h>
 #include <linux/smp.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
@@ -64,7 +65,7 @@ struct aes_ctx {
         u32 *D;
 };
 
-static DEFINE_PER_CPU(struct cword *, last_cword);
+static DEFINE_PER_CPU(struct cword *, paes_last_cword);
 
 /* Tells whether the ACE is capable to generate
    the extended key for a given key_len. */
@@ -152,9 +153,9 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
 
 ok:
         for_each_online_cpu(cpu)
-                if (&ctx->cword.encrypt == per_cpu(last_cword, cpu) ||
-                    &ctx->cword.decrypt == per_cpu(last_cword, cpu))
-                        per_cpu(last_cword, cpu) = NULL;
+                if (&ctx->cword.encrypt == per_cpu(paes_last_cword, cpu) ||
+                    &ctx->cword.decrypt == per_cpu(paes_last_cword, cpu))
+                        per_cpu(paes_last_cword, cpu) = NULL;
 
         return 0;
 }
@@ -166,7 +167,7 @@ static inline void padlock_reset_key(struct cword *cword)
 {
         int cpu = raw_smp_processor_id();
 
-        if (cword != per_cpu(last_cword, cpu))
+        if (cword != per_cpu(paes_last_cword, cpu))
 #ifndef CONFIG_X86_64
                 asm volatile ("pushfl; popfl");
 #else
@@ -176,7 +177,7 @@ static inline void padlock_reset_key(struct cword *cword)
 
 static inline void padlock_store_cword(struct cword *cword)
 {
-        per_cpu(last_cword, raw_smp_processor_id()) = cword;
+        per_cpu(paes_last_cword, raw_smp_processor_id()) = cword;
 }
 
 /*