MIPS: ELF: Restructure personality macros

Update the ELF personality macros used for individual ABIs to make
actions in the same order across all of them and match formatting too.

Signed-off-by: Maciej W. Rozycki <macro@imgtec.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Fortune <Matthew.Fortune@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index 1bcbadb445fb16e1c265eff81e2d8391edcb404a..1fba19747fa94d5f3bcb0b107dcc8323ba2518e9 100644 (file)
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -305,17 +305,16 @@ extern struct mips_abi mips_abi_n32;
 
 #define SET_PERSONALITY2(ex, state)                                    \
 do {                                                                   \
-       if (personality(current->personality) != PER_LINUX)             \
-               set_personality(PER_LINUX);                             \
-                                                                       \
        clear_thread_flag(TIF_HYBRID_FPREGS);                           \
        set_thread_flag(TIF_32BIT_FPREGS);                              \
                                                                        \
-       mips_set_personality_fp(state);                                 \
-                                                                       \
        current->thread.abi = &mips_abi;                                \
                                                                        \
+       mips_set_personality_fp(state);                                 \
        mips_set_personality_nan(state);                                \
+                                                                       \
+       if (personality(current->personality) != PER_LINUX)             \
+               set_personality(PER_LINUX);                             \
 } while (0)
 
 #endif /* CONFIG_32BIT */
@@ -326,6 +325,7 @@ do {                                                                        \
 #define __SET_PERSONALITY32_N32()                                      \
        do {                                                            \
                set_thread_flag(TIF_32BIT_ADDR);                        \
+                                                                       \
                current->thread.abi = &mips_abi_n32;                    \
        } while (0)
 #else
@@ -341,9 +341,9 @@ do {                                                                        \
                clear_thread_flag(TIF_HYBRID_FPREGS);                   \
                set_thread_flag(TIF_32BIT_FPREGS);                      \
                                                                        \
-               mips_set_personality_fp(state);                         \
-                                                                       \
                current->thread.abi = &mips_abi_32;                     \
+                                                                       \
+               mips_set_personality_fp(state);                         \
        } while (0)
 #else
 #define __SET_PERSONALITY32_O32(ex, state)                             \