aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:32:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:32:52 -0400
commite4856a70cfc23266631a78e78277cf2b195babee (patch)
treee163aa148bf6ec00e1506a870adf3aeabf083f52 /arch/arm
parentd1b5726358ccebcf614fc9f97cdf3354178dcb80 (diff)
parent0b59268285ca6cdc46191f2995bf632088e3e277 (diff)
Merge branch 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'personality' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/elf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 5be016980c19..a58378c343b9 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -107,6 +107,6 @@ extern int arm_elf_read_implies_exec(const struct elf32_hdr *, int);
107#define ELF_PLAT_INIT(_r, load_addr) (_r)->ARM_r0 = 0 107#define ELF_PLAT_INIT(_r, load_addr) (_r)->ARM_r0 = 0
108 108
109extern void elf_set_personality(const struct elf32_hdr *); 109extern void elf_set_personality(const struct elf32_hdr *);
110#define SET_PERSONALITY(ex, ibcs2) elf_set_personality(&(ex)) 110#define SET_PERSONALITY(ex) elf_set_personality(&(ex))
111 111
112#endif 112#endif