Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / crypto / padlock.h

diff --git a/drivers/crypto/padlock.h b/include/crypto/padlock.h
similarity index 82%
rename from drivers/crypto/padlock.h
rename to include/crypto/padlock.h
index b728e4518bd1582958b20cc330bfe8d8400ba11b..d2cfa2ef49e822e35d344b504c0f2dec29720881 100644 (file)
--- a/drivers/crypto/padlock.h
+++ b/include/crypto/padlock.h
@@ -15,9 +15,15 @@
 
 #define PADLOCK_ALIGNMENT 16
 
-#define PFX    "padlock: "
+#define PFX    KBUILD_MODNAME ": "
 
 #define PADLOCK_CRA_PRIORITY   300
 #define PADLOCK_COMPOSITE_PRIORITY 400
 
+#ifdef CONFIG_64BIT
+#define STACK_ALIGN 16
+#else
+#define STACK_ALIGN 4
+#endif
+
 #endif /* _CRYPTO_PADLOCK_H */