summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/elf.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 21:32:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 21:32:52 +0200
commite4856a70cfc23266631a78e78277cf2b195babee (patch)
treee163aa148bf6ec00e1506a870adf3aeabf083f52 /include/asm-x86/elf.h
parentMerge branch 'docs' of git://git.lwn.net/linux-2.6 (diff)
parent[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY (diff)
downloadlinux-e4856a70cfc23266631a78e78277cf2b195babee.tar.xz
linux-e4856a70cfc23266631a78e78277cf2b195babee.zip
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 'include/asm-x86/elf.h')
-rw-r--r--include/asm-x86/elf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
index 5c4745bec906..26bc15f01e78 100644
--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
@@ -186,7 +186,7 @@ do { \
set_fs(USER_DS); \
} while (0)
-#define COMPAT_SET_PERSONALITY(ex, ibcs2) \
+#define COMPAT_SET_PERSONALITY(ex) \
do { \
if (test_thread_flag(TIF_IA32)) \
clear_thread_flag(TIF_ABI_PENDING); \
@@ -267,7 +267,7 @@ extern int force_personality32;
For the moment, we have only optimizations for the Intel generations,
but that could change... */
-#define SET_PERSONALITY(ex, ibcs2) set_personality_64bit()
+#define SET_PERSONALITY(ex) set_personality_64bit()
/*
* An executable for which elf_read_implies_exec() returns TRUE will