---

yaml --- r: 198014 b: refs/heads/master c: ec49fdb h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 66246ce · 66246ce
1 parent f7a0987
commit 66246ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4581ced379736fd76432c754f999d26deb83fbb7
+refs/heads/master: ec49fdbd354cb133340e25ff84d88284bb17e99a
diff --git a/trunk/include/linux/crypto.h b/trunk/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)))