Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 24d2e30f1b4649ad69e44ab25813b4f85c11b352..a6a7a1c83f54c1f7430b7d4306f31aaabc126eaa 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -99,13 +99,7 @@
  * as arm where pointers are 32-bit aligned but there are data types such as
  * u64 which require 64-bit alignment.
  */
-#if defined(ARCH_KMALLOC_MINALIGN)
 #define CRYPTO_MINALIGN ARCH_KMALLOC_MINALIGN
-#elif defined(ARCH_SLAB_MINALIGN)
-#define CRYPTO_MINALIGN ARCH_SLAB_MINALIGN
-#else
-#define CRYPTO_MINALIGN __alignof__(unsigned long long)
-#endif
 
 #define CRYPTO_MINALIGN_ATTR __attribute__ ((__aligned__(CRYPTO_MINALIGN)))