aboutsummaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:32:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 12:32:52 -0700
commite4856a70cfc23266631a78e78277cf2b195babee (patch)
treee163aa148bf6ec00e1506a870adf3aeabf083f52 /arch/alpha
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/alpha')
-rw-r--r--arch/alpha/include/asm/elf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
index fc1002ea1e0..5c75c1b2352 100644
--- 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;