From: Allen Pais <allen.pais@oracle.com>
Date: Thu, 29 May 2014 11:18:33 +0000 (+0530)
Subject: sparc64: crypto camellia opcode error fix
X-Git-Tag: v4.1.12-92~74^2~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=de0a22fe59537ae8203544e1838aa134f7ae22c6;p=users%2Fjedix%2Flinux-maple.git

sparc64: crypto camellia opcode error fix

Orabug: 23128525

Signed-off-by: Allen Pais <allen.pais@oracle.com>
(cherry picked from commit fc1b755de4250245961b226da41d10f066467926)
(cherry picked from commit c6cb169240529eb974a5846e55e622001973b79f)
(cherry picked from commit 8d140eb4166d127dc0f64595ec17e441beb4b47c)
---

diff --git a/arch/sparc/crypto/camellia_glue.c b/arch/sparc/crypto/camellia_glue.c
index 561a84d93cf68..9d7fbe197be17 100644
--- a/arch/sparc/crypto/camellia_glue.c
+++ b/arch/sparc/crypto/camellia_glue.c
@@ -18,6 +18,8 @@
 
 #include "opcodes.h"
 
+#define CFR_CAMELLIA   _AC(0x0000000000000008,UL) /* Supports CAMELLIA opcodes*/
+
 #define CAMELLIA_MIN_KEY_SIZE        16
 #define CAMELLIA_MAX_KEY_SIZE        32
 #define CAMELLIA_BLOCK_SIZE          16