author: Mike Frysinger <vapier@gentoo.org> 2010-06-29 15:05:21 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2010-06-29 15:29:31 -0700
commit: 2952095c6b2eefd068dda0dee6317cf95155a304
parent: 12c46b336540b483df10d794bdee5d2f1aa8e33a
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 5 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index b6ab27ccf214..811384bec8de 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -68,11 +68,7 @@
* Here we can be a bit looser than the data sections since this
* needs to only meet arch ABI requirements.
*/
-#ifdef ARCH_SLAB_MINALIGN
-#define FLAT_STACK_ALIGN (ARCH_SLAB_MINALIGN)
-#else
-#define FLAT_STACK_ALIGN (sizeof(void *))
-#endif
+#define FLAT_STACK_ALIGN max_t(unsigned long, sizeof(void *), ARCH_SLAB_MINALIGN)
#define RELOC_FAILED 0xff00ff01 /* Relocation incorrect somewhere */
#define UNLOADED_LIB 0x7ff000ff /* Placeholder for unused library */