From 66246cefda7728a9c6242c66d66f21046b99f9a9 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 19 May 2010 12:02:17 +0100 Subject: [PATCH] --- yaml --- r: 198014 b: refs/heads/master c: ec49fdbd354cb133340e25ff84d88284bb17e99a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/crypto.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d1a83ced9b72..de477767254a 100644 --- 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 index 24d2e30f1b46..a6a7a1c83f54 100644 --- 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)))