From d089536003314298b53a3850e89930b3f1411a8b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 29 Jun 2010 15:05:21 -0700
Subject: [PATCH] --- yaml --- r: 200639 b: refs/heads/master c:
 2952095c6b2eefd068dda0dee6317cf95155a304 h: refs/heads/master i:   200637:
 d729aebcf5993f2991fe62b29ebf14cf20ecae46   200635:
 e205112fa1068f85682ce9dc42070edb00659552   200631:
 38f407e04f81285e6bfb65705f87455ff7294a3f   200623:
 7895b13b6898364c12eb6b5ccf7ab9b6dc55ddb3   200607:
 fef3d5555a5c74eb2d283023dd6ae1cdcd812a36   200575:
 3144212462dce007ae0016cda095676291b4d644 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/binfmt_flat.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7189e0d90421..6ada9257885c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12c46b336540b483df10d794bdee5d2f1aa8e33a
+refs/heads/master: 2952095c6b2eefd068dda0dee6317cf95155a304
diff --git a/trunk/fs/binfmt_flat.c b/trunk/fs/binfmt_flat.c
index b6ab27ccf214..811384bec8de 100644
--- a/trunk/fs/binfmt_flat.c
+++ b/trunk/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 */