---

yaml --- r: 200639 b: refs/heads/master c: 2952095 h: refs/heads/master i: 200637: d729aeb 200635: e205112 200631: 38f407e 200623: 7895b13 200607: fef3d55 200575: 3144212 v: v3
git-mirror · Jun 29, 2010 · d089536 · d089536
1 parent 0ea1436
commit d089536
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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 */