Merge branch 'standalone-master' into standalone-rename

30 files changed, 24 insertions, 28 deletions

diff --git a/crypto/userspace/libtomcrypt/headers/tomcrypt.h b/crypto/userspace/libtomcrypt/headers/tomcrypt.h
index 51fe804df8c..fdb6c8d1f16 100644
--- a/crypto/userspace/libtomcrypt/headers/tomcrypt.h
+++ b/crypto/userspace/libtomcrypt/headers/tomcrypt.h
@@ -2,6 +2,7 @@
 #define TOMCRYPT_H_
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/nls.h>
diff --git a/crypto/userspace/libtomcrypt/math/rand_prime.c b/crypto/userspace/libtomcrypt/math/rand_prime.c
index ab73cd041c7..5eff3a188ca 100644
--- a/crypto/userspace/libtomcrypt/math/rand_prime.c
+++ b/crypto/userspace/libtomcrypt/math/rand_prime.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file rand_prime.c
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_flexi.c b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_flexi.c
index 3f01a579346..e84f72e7cd9 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_flexi.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_flexi.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file der_decode_sequence_flexi.c
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_multi.c b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_multi.c
index d1b78781c88..c064d9ee3ff 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_multi.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_decode_sequence_multi.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <stdarg.h>
-#include <linux/slab.h>
+
 
 
 /**
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_encode_sequence_multi.c b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_encode_sequence_multi.c
index 7e813172c60..8d53c623965 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_encode_sequence_multi.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_encode_sequence_multi.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <stdarg.h>
-#include <linux/slab.h>
+
 
 
 /**
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_sequence_free.c b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_sequence_free.c
index eed73e7efdf..90a1297347d 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_sequence_free.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/sequence/der_sequence_free.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file der_sequence_free.c
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_set.c b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_set.c
index babb9ea392e..8a13479a180 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_set.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_set.c
@@ -9,7 +9,7 @@
   * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file der_encode_set.c
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c
index 2a343f2c166..aa1af729b6b 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file der_encode_setof.c
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c b/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
index 8a5005fa720..3ebb8ea977f 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 /**
   @file der_encode_sequence_multi.c
   ASN.1 DER, encode a Subject Public Key structure --nmav
diff --git a/crypto/userspace/libtomcrypt/pk/dsa/dsa_export.c b/crypto/userspace/libtomcrypt/pk/dsa/dsa_export.c
index f2cd714d271..5a2d5df87c7 100644
--- a/crypto/userspace/libtomcrypt/pk/dsa/dsa_export.c
+++ b/crypto/userspace/libtomcrypt/pk/dsa/dsa_export.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
    @file dsa_export.c
diff --git a/crypto/userspace/libtomcrypt/pk/dsa/dsa_import.c b/crypto/userspace/libtomcrypt/pk/dsa/dsa_import.c
index 99001f2c22d..c6a1f6f6037 100644
--- a/crypto/userspace/libtomcrypt/pk/dsa/dsa_import.c
+++ b/crypto/userspace/libtomcrypt/pk/dsa/dsa_import.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
    @file dsa_import.c
diff --git a/crypto/userspace/libtomcrypt/pk/dsa/dsa_make_key.c b/crypto/userspace/libtomcrypt/pk/dsa/dsa_make_key.c
index 1831853b692..eab5d155899 100644
--- a/crypto/userspace/libtomcrypt/pk/dsa/dsa_make_key.c
+++ b/crypto/userspace/libtomcrypt/pk/dsa/dsa_make_key.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
    @file dsa_make_key.c
diff --git a/crypto/userspace/libtomcrypt/pk/dsa/dsa_sign_hash.c b/crypto/userspace/libtomcrypt/pk/dsa/dsa_sign_hash.c
index b48d5a5696d..6f4dad8d3e6 100644
--- a/crypto/userspace/libtomcrypt/pk/dsa/dsa_sign_hash.c
+++ b/crypto/userspace/libtomcrypt/pk/dsa/dsa_sign_hash.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
    @file dsa_sign_hash.c
diff --git a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_mgf1.c b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_mgf1.c
index 86ba2189a57..bfa3e7e9192 100644
--- a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_mgf1.c
+++ b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_mgf1.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 
 /**
   @file pkcs_1_mgf1.c
diff --git a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_decode.c b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_decode.c
index 717d99dd324..04833ff03b1 100644
--- a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_decode.c
+++ b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_decode.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 
 /**
   @file pkcs_1_oaep_decode.c
diff --git a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_encode.c b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_encode.c
index 331516fa094..ab75f73d7d0 100644
--- a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_encode.c
+++ b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_oaep_encode.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 
 /**
   @file pkcs_1_oaep_encode.c
diff --git a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_decode.c b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_decode.c
index 5d44ce8324e..789d12d9d42 100644
--- a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_decode.c
+++ b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_decode.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 
 /**
   @file pkcs_1_pss_decode.c
diff --git a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_encode.c b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_encode.c
index 9416eaede58..d3ce3d9c012 100644
--- a/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_encode.c
+++ b/crypto/userspace/libtomcrypt/pk/pkcs1/pkcs_1_pss_encode.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 
 /**
   @file pkcs_1_pss_encode.c
diff --git a/crypto/userspace/libtomcrypt/pk/rsa/rsa_decrypt_key.c b/crypto/userspace/libtomcrypt/pk/rsa/rsa_decrypt_key.c
index ba16e32021e..813a76544f1 100644
--- a/crypto/userspace/libtomcrypt/pk/rsa/rsa_decrypt_key.c
+++ b/crypto/userspace/libtomcrypt/pk/rsa/rsa_decrypt_key.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include "ncr-int.h"
-#include <linux/slab.h>
+
 
 /**
   @file rsa_decrypt_key.c
diff --git a/crypto/userspace/libtomcrypt/pk/rsa/rsa_export.c b/crypto/userspace/libtomcrypt/pk/rsa/rsa_export.c
index c5e8ff0a65d..21f859caaab 100644
--- a/crypto/userspace/libtomcrypt/pk/rsa/rsa_export.c
+++ b/crypto/userspace/libtomcrypt/pk/rsa/rsa_export.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include <ncr-int.h>
-#include <linux/slab.h>
+
 /**
   @file rsa_export.c
   Export RSA LTC_PKCS keys, Tom St Denis
diff --git a/crypto/userspace/libtomcrypt/pk/rsa/rsa_import.c b/crypto/userspace/libtomcrypt/pk/rsa/rsa_import.c
index 8bd8c47de21..9f3c5bfa642 100644
--- a/crypto/userspace/libtomcrypt/pk/rsa/rsa_import.c
+++ b/crypto/userspace/libtomcrypt/pk/rsa/rsa_import.c
@@ -9,7 +9,7 @@
  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
-#include <linux/slab.h>
+
 
 /**
   @file rsa_import.c
diff --git a/crypto/userspace/libtomcrypt/pk/rsa/rsa_sign_hash.c b/crypto/userspace/libtomcrypt/pk/rsa/rsa_sign_hash.c
index b3c2f5b2ab5..faf13d27b8f 100644
--- a/crypto/userspace/libtomcrypt/pk/rsa/rsa_sign_hash.c
+++ b/crypto/userspace/libtomcrypt/pk/rsa/rsa_sign_hash.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include "ncr-int.h"
-#include <linux/slab.h>
+
 
 /**
   @file rsa_sign_hash.c
diff --git a/crypto/userspace/libtomcrypt/pk/rsa/rsa_verify_hash.c b/crypto/userspace/libtomcrypt/pk/rsa/rsa_verify_hash.c
index b9ef89fd47a..803b7cd4edf 100644
--- a/crypto/userspace/libtomcrypt/pk/rsa/rsa_verify_hash.c
+++ b/crypto/userspace/libtomcrypt/pk/rsa/rsa_verify_hash.c
@@ -10,7 +10,7 @@
  */
 #include "tomcrypt.h"
 #include "ncr-int.h"
-#include <linux/slab.h>
+
 
 /**
   @file rsa_verify_hash.c
diff --git a/crypto/userspace/libtommath/bn_mp_clear.c b/crypto/userspace/libtommath/bn_mp_clear.c
index 05ee8e7e200..a65f0a36c49 100644
--- a/crypto/userspace/libtommath/bn_mp_clear.c
+++ b/crypto/userspace/libtommath/bn_mp_clear.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_CLEAR_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/bn_mp_grow.c b/crypto/userspace/libtommath/bn_mp_grow.c
index 3646c6c86d8..cf2b949b248 100644
--- a/crypto/userspace/libtommath/bn_mp_grow.c
+++ b/crypto/userspace/libtommath/bn_mp_grow.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_GROW_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/bn_mp_init.c b/crypto/userspace/libtommath/bn_mp_init.c
index 990500ba09f..8be27f5696a 100644
--- a/crypto/userspace/libtommath/bn_mp_init.c
+++ b/crypto/userspace/libtommath/bn_mp_init.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_INIT_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/bn_mp_init_size.c b/crypto/userspace/libtommath/bn_mp_init_size.c
index ba46d3ab693..8e014183a3e 100644
--- a/crypto/userspace/libtommath/bn_mp_init_size.c
+++ b/crypto/userspace/libtommath/bn_mp_init_size.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_INIT_SIZE_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/bn_mp_prime_random_ex.c b/crypto/userspace/libtommath/bn_mp_prime_random_ex.c
index 741bfd168b7..07aae4b072e 100644
--- a/crypto/userspace/libtommath/bn_mp_prime_random_ex.c
+++ b/crypto/userspace/libtommath/bn_mp_prime_random_ex.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_PRIME_RANDOM_EX_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/bn_mp_shrink.c b/crypto/userspace/libtommath/bn_mp_shrink.c
index 3e38556be9f..4b8c5ef11ad 100644
--- a/crypto/userspace/libtommath/bn_mp_shrink.c
+++ b/crypto/userspace/libtommath/bn_mp_shrink.c
@@ -1,5 +1,4 @@
 #include <tommath.h>
-#include <linux/slab.h>
 #ifdef BN_MP_SHRINK_C
 /* LibTomMath, multiple-precision integer library -- Tom St Denis
  *
diff --git a/crypto/userspace/libtommath/tommath.h b/crypto/userspace/libtommath/tommath.h
index 37fb23cac16..31ded829977 100644
--- a/crypto/userspace/libtommath/tommath.h
+++ b/crypto/userspace/libtommath/tommath.h
@@ -17,6 +17,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/ctype.h>