commit e72837e3e7bae3f182c4ac63c9424e86f1158dd0
author Al Viro <viro@zeniv.linux.org.uk> Sun Feb 17 17:47:04 2013 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Tue Feb 26 02:46:08 2013 -0500
tree 0d4d51e61aff21b3e6d3b1816b8cb52edcfbd39e
parent 79f9f99ad1e3e19d4ac300573b51289e3ee8ba86

default SET_PERSONALITY() in linux/elf.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/s390/include/asm/elf.h

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 178ff96..1bfdf24 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -180,10 +180,7 @@
 extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
-#ifndef CONFIG_64BIT
-#define SET_PERSONALITY(ex) \
-	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
-#else /* CONFIG_64BIT */
+#ifdef CONFIG_64BIT
 #define SET_PERSONALITY(ex)					\
 do {								\
 	if (personality(current->personality) != PER_LINUX32)	\