Merge branch 'linus' into core/futexes

[sfrench/cifs-2.6.git] / arch / alpha / include / asm / elf.h

diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index fc1002ea1e0c766c5150e633d1a83dfa7700a17f..5c75c1b2352a9cacf7c47de5c04d57b1bab7211b 100644 (file)
--- a/arch/alpha/include/asm/elf.h
+++ b/arch/alpha/include/asm/elf.h
@@ -144,9 +144,9 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
        : amask (AMASK_CIX) ? "ev6" : "ev67");  \
 })
 
-#define SET_PERSONALITY(EX, IBCS2)                             \
+#define SET_PERSONALITY(EX)                                    \
        set_personality(((EX).e_flags & EF_ALPHA_32BIT)         \
-          ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
+          ? PER_LINUX_32BIT : PER_LINUX)
 
 extern int alpha_l1i_cacheshape;
 extern int alpha_l1d_cacheshape;