diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:57:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:02:14 -0400 |
| commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
| tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /arch/arc/include/asm/elf.h | |
| parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'arch/arc/include/asm/elf.h')
| -rw-r--r-- | arch/arc/include/asm/elf.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arc/include/asm/elf.h b/arch/arc/include/asm/elf.h index f4c8d36ebecb..a26282857683 100644 --- a/arch/arc/include/asm/elf.h +++ b/arch/arc/include/asm/elf.h | |||
| @@ -72,7 +72,4 @@ extern int elf_check_arch(const struct elf32_hdr *); | |||
| 72 | */ | 72 | */ |
| 73 | #define ELF_PLATFORM (NULL) | 73 | #define ELF_PLATFORM (NULL) |
| 74 | 74 | ||
| 75 | #define SET_PERSONALITY(ex) \ | ||
| 76 | set_personality(PER_LINUX | (current->personality & (~PER_MASK))) | ||
| 77 | |||
| 78 | #endif | 75 | #endif |