diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-16 09:39:57 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-10-16 09:40:05 -0400 |
commit | 0b59268285ca6cdc46191f2995bf632088e3e277 (patch) | |
tree | 91f95eeb809c5fe13d0ba5b055e26879f9ec9357 /fs/binfmt_elf.c | |
parent | 04ab591808565f968d4406f6435090ad671ebdab (diff) |
[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY
The SET_PERSONALITY macro is always called with a second argument of 0.
Remove the ibcs argument and the various tests to set the PER_SVR4
personality.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r-- | fs/binfmt_elf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 655ed8d30a86..c76afa26edf7 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -683,7 +683,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
683 | * switch really is going to happen - do this in | 683 | * switch really is going to happen - do this in |
684 | * flush_thread(). - akpm | 684 | * flush_thread(). - akpm |
685 | */ | 685 | */ |
686 | SET_PERSONALITY(loc->elf_ex, 0); | 686 | SET_PERSONALITY(loc->elf_ex); |
687 | 687 | ||
688 | interpreter = open_exec(elf_interpreter); | 688 | interpreter = open_exec(elf_interpreter); |
689 | retval = PTR_ERR(interpreter); | 689 | retval = PTR_ERR(interpreter); |
@@ -734,7 +734,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
734 | goto out_free_dentry; | 734 | goto out_free_dentry; |
735 | } else { | 735 | } else { |
736 | /* Executables without an interpreter also need a personality */ | 736 | /* Executables without an interpreter also need a personality */ |
737 | SET_PERSONALITY(loc->elf_ex, 0); | 737 | SET_PERSONALITY(loc->elf_ex); |
738 | } | 738 | } |
739 | 739 | ||
740 | /* Flush all traces of the currently running executable */ | 740 | /* Flush all traces of the currently running executable */ |
@@ -748,7 +748,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) | |||
748 | 748 | ||
749 | /* Do this immediately, since STACK_TOP as used in setup_arg_pages | 749 | /* Do this immediately, since STACK_TOP as used in setup_arg_pages |
750 | may depend on the personality. */ | 750 | may depend on the personality. */ |
751 | SET_PERSONALITY(loc->elf_ex, 0); | 751 | SET_PERSONALITY(loc->elf_ex); |
752 | if (elf_read_implies_exec(loc->elf_ex, executable_stack)) | 752 | if (elf_read_implies_exec(loc->elf_ex, executable_stack)) |
753 | current->personality |= READ_IMPLIES_EXEC; | 753 | current->personality |= READ_IMPLIES_EXEC; |
754 | 754 | ||