diff options
| -rw-r--r-- | fs/binfmt_flat.c | 6 | 
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index b6ab27ccf21..811384bec8d 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 */  |