This patch contains the scheduled removal of the a.out interpreter

support for ELF executables.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
 Documentation/feature-removal-schedule.txt |   11 -

 fs/binfmt_elf.c                            |  142 +--------------------

 2 files changed, 13 insertions(+), 140 deletions(-)
aca21a4f123d9844fc03c69c3313c5a715a2fd36

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt

index e754923..bca1eda 100644

--- a/Documentation/feature-removal-schedule.txt

+++ b/Documentation/feature-removal-schedule.txt

@@ -107,17 +107,6 @@ Who:	Eric Biederman <ebiederm@xmission.com>
 ---------------------------
-What:  a.out interpreter support for ELF executables

-When:  2.6.25

-Files: fs/binfmt_elf.c

-Why:   Using a.out interpreters for ELF executables was a feature for

-       transition from a.out to ELF. But now it is unlikely to be still

-       needed anymore and removing it would simplify the hairy ELF

-       loader code.

-Who:   Andi Kleen <ak@suse.de>

-

----------------------------

-

 What:	remove EXPORT_SYMBOL(kernel_thread)

 When:	August 2006

 Files:	arch/*/kernel/*_ksyms.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c

index ba8de7c..30e1a75 100644

--- a/fs/binfmt_elf.c

+++ b/fs/binfmt_elf.c

@@ -133,7 +133,7 @@ static int padzero(unsigned long elf_bss)
 static int

 create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,

-		int interp_aout, unsigned long load_addr,

+		unsigned long load_addr,

 		unsigned long interp_load_addr)

 {

 	unsigned long p = bprm->p;

@@ -223,11 +223,8 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,

 	sp = STACK_ADD(p, ei_index);
 	items = (argc + 1) + (envc + 1);

-	if (interp_aout) {

-		items += 3; /* a.out interpreters require argv & envp too */

-	} else {

-		items += 1; /* ELF interpreters only put argc on the stack */

-	}

+	items += 1; /* ELF interpreters only put argc on the stack...
[ message continues ]

I already have a similar patch queued
ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt/patches/remove-aout-interpr...
Also removal of the old unused iBCS hooks while I was on it
ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt/patches/remove-ibcs-support
-Andi

--

Guys, please take a look at similar patches from David in -mm before even

vaguely thinking of breathing anywhere in the remote vicinity of

fs/binfmt_elf.c (sob).
--

What David's patch does in fs/binfmt_elf.c is to make code conditional -

exactly the code Andi removes as scheduled in 2.6.25. You should be able

to simply drop the fs/binfmt_elf.c parts from

aout-suppress-aout-library-support-if-config_arch_supports_aout.patch.
cu

Adrian
BTW: There are also patch conflicts with git-x86, but since they are not

     from David you have yet to ask us to look at them.  ;-)
-- 
       "Is there not promise of rain?" Ling Tan asked suddenly out

        of the darkness. There had been need of rain for many days.

       "Only a promise," Lao Er said.

                                       Pearl S. Buck - Dragon Seed
--

Is iBCS support the basis for SCO & SVr4 support?  (These both sound

useful.)

--

Yes, but that always required an external patchkit which AFAIK existed

only for 2.4. The point is that if you have to apply an external

patchkit anyways you can as well apply the small patches for these hooks

too. But it doesn't make sense to carry the (admittedly minor) overhead

for this in all kernels. Also the ELF loader is quite hairy code

and any simplification of it helps.
-Andi

--