Merge branch 'atmel'

[linux-2.6] / include / asm-arm / elf.h

diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index cbceacbe5afadae6e8ee0b5ce8b7e993e56a9eaf..7da97a937548afd05a977ceb0d2148821dc05cfb 100644 (file)
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -38,9 +38,9 @@ typedef struct user_fp elf_fpregset_t;
  */
 #define ELF_CLASS      ELFCLASS32
 #ifdef __ARMEB__
-#define ELF_DATA       ELFDATA2MSB;
+#define ELF_DATA       ELFDATA2MSB
 #else
-#define ELF_DATA       ELFDATA2LSB;
+#define ELF_DATA       ELFDATA2LSB
 #endif
 #define ELF_ARCH       EM_ARM
 
@@ -124,6 +124,8 @@ do { \
        if (((ex).e_flags & EF_ARM_EABI_MASK) || \
            ((ex).e_flags & EF_ARM_SOFT_FLOAT)) \
                set_thread_flag(TIF_USING_IWMMXT); \
+       else \
+               clear_thread_flag(TIF_USING_IWMMXT); \
 } while (0)
 
 #endif