55 files changed, 689 insertions, 645 deletions

diff --git a/arch/cris/include/arch-v10/arch/Kbuild b/arch/cris/include/arch-v10/arch/Kbuild
index 7a192e1290b1..1f0fc7a66f5f 100644
--- a/arch/cris/include/arch-v10/arch/Kbuild
+++ b/arch/cris/include/arch-v10/arch/Kbuild
@@ -1,4 +1 @@
-header-y += user.h
-header-y += svinto.h
-header-y += sv_addr_ag.h
-header-y += sv_addr.agh
+# CRISv10 arch
diff --git a/arch/cris/include/arch-v32/arch/Kbuild b/arch/cris/include/arch-v32/arch/Kbuild
index 35f2fc4f993e..2fd65c7e15c9 100644
--- a/arch/cris/include/arch-v32/arch/Kbuild
+++ b/arch/cris/include/arch-v32/arch/Kbuild
@@ -1,2 +1 @@
-header-y += user.h
-header-y += cryptocop.h
+# CRISv32 arch
diff --git a/arch/cris/include/arch-v32/arch/cryptocop.h b/arch/cris/include/arch-v32/arch/cryptocop.h
index e1cd83dfabb5..716e434e9269 100644
--- a/arch/cris/include/arch-v32/arch/cryptocop.h
+++ b/arch/cris/include/arch-v32/arch/cryptocop.h
@@ -2,124 +2,12 @@
  * The device /dev/cryptocop is accessible using this driver using
  * CRYPTOCOP_MAJOR (254) and minor number 0.
  */
-
 #ifndef CRYPTOCOP_H
 #define CRYPTOCOP_H
 
-#include <linux/uio.h>
-
-
-#define CRYPTOCOP_SESSION_ID_NONE (0)
-
-typedef unsigned long long int cryptocop_session_id;
-
-/* cryptocop ioctls */
-#define ETRAXCRYPTOCOP_IOCTYPE         (250)
-
-#define CRYPTOCOP_IO_CREATE_SESSION    _IOWR(ETRAXCRYPTOCOP_IOCTYPE, 1, struct strcop_session_op)
-#define CRYPTOCOP_IO_CLOSE_SESSION     _IOW(ETRAXCRYPTOCOP_IOCTYPE, 2, struct strcop_session_op)
-#define CRYPTOCOP_IO_PROCESS_OP        _IOWR(ETRAXCRYPTOCOP_IOCTYPE, 3, struct strcop_crypto_op)
-#define CRYPTOCOP_IO_MAXNR             (3)
-
-typedef enum {
-        cryptocop_cipher_des = 0,
-        cryptocop_cipher_3des = 1,
-        cryptocop_cipher_aes = 2,
-        cryptocop_cipher_m2m = 3, /* mem2mem is essentially a NULL cipher with blocklength=1 */
-        cryptocop_cipher_none
-} cryptocop_cipher_type;
-
-typedef enum {
-        cryptocop_digest_sha1 = 0,
-        cryptocop_digest_md5 = 1,
-        cryptocop_digest_none
-} cryptocop_digest_type;
-
-typedef enum {
-        cryptocop_csum_le = 0,
-        cryptocop_csum_be = 1,
-        cryptocop_csum_none
-} cryptocop_csum_type;
-
-typedef enum {
-        cryptocop_cipher_mode_ecb = 0,
-        cryptocop_cipher_mode_cbc,
-        cryptocop_cipher_mode_none
-} cryptocop_cipher_mode;
-
-typedef enum {
-        cryptocop_3des_eee = 0,
-        cryptocop_3des_eed = 1,
-        cryptocop_3des_ede = 2,
-        cryptocop_3des_edd = 3,
-        cryptocop_3des_dee = 4,
-        cryptocop_3des_ded = 5,
-        cryptocop_3des_dde = 6,
-        cryptocop_3des_ddd = 7
-} cryptocop_3des_mode;
-
-/* Usermode accessible (ioctl) operations. */
-struct strcop_session_op{
-        cryptocop_session_id    ses_id;
-
-        cryptocop_cipher_type   cipher; /* AES, DES, 3DES, m2m, none */
-
-        cryptocop_cipher_mode   cmode; /* ECB, CBC, none */
-        cryptocop_3des_mode     des3_mode;
-
-        cryptocop_digest_type   digest; /* MD5, SHA1, none */
-
-        cryptocop_csum_type     csum;   /* BE, LE, none */
-
-        unsigned char           *key;
-        size_t                  keylen;
-};
-
-#define CRYPTOCOP_CSUM_LENGTH         (2)
-#define CRYPTOCOP_MAX_DIGEST_LENGTH   (20)  /* SHA-1 20, MD5 16 */
-#define CRYPTOCOP_MAX_IV_LENGTH       (16)  /* (3)DES==8, AES == 16 */
-#define CRYPTOCOP_MAX_KEY_LENGTH      (32)
-
-struct strcop_crypto_op{
-        cryptocop_session_id ses_id;
-
-        /* Indata. */
-        unsigned char            *indata;
-        size_t                   inlen; /* Total indata length. */
-
-        /* Cipher configuration. */
-        unsigned char            do_cipher:1;
-        unsigned char            decrypt:1; /* 1 == decrypt, 0 == encrypt */
-        unsigned char            cipher_explicit:1;
-        size_t                   cipher_start;
-        size_t                   cipher_len;
-        /* cipher_iv is used if do_cipher and cipher_explicit and the cipher
-           mode is CBC.  The length is controlled by the type of cipher,
+#include <uapi/arch-v32/arch/cryptocop.h>