The patch titled
     FLAT binaries: drop BINFMT_FLAT bad header magic warning
has been removed from the -mm tree.  Its filename was
     flat-binaries-drop-binfmt_flat-bad-header-magic-warning.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: FLAT binaries: drop BINFMT_FLAT bad header magic warning
From: Mike Frysinger <[EMAIL PROTECTED]>

The warning issued by fs/binfmt_flat.c when the format handler is given a
non-FLAT and non-script executable is annoying to say the least when working
with FDPIC ELF objects.  If you build a kernel that supports both FLAT and
FDPIC ELFs on no-mmu, every time you execute an FDPIC ELF, the kernel spits
out this message.  While I understand a lot of newcomers to the no-mmu world
screw up generation of FLAT binaries, this warning is not usable for systems
that support more than just FLAT.

Signed-off-by: Jie Zhang <[EMAIL PROTECTED]>
Signed-off-by: Mike Frysinger <[EMAIL PROTECTED]>
Cc: Bernd Schmidt <[EMAIL PROTECTED]>
Acked-by: Greg Ungerer <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 fs/binfmt_flat.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN 
fs/binfmt_flat.c~flat-binaries-drop-binfmt_flat-bad-header-magic-warning 
fs/binfmt_flat.c
--- a/fs/binfmt_flat.c~flat-binaries-drop-binfmt_flat-bad-header-magic-warning
+++ a/fs/binfmt_flat.c
@@ -443,12 +443,12 @@ static int load_flat_file(struct linux_b
 
        if (strncmp(hdr->magic, "bFLT", 4)) {
                /*
+                * Previously, here was a printk to tell people
+                *   "BINFMT_FLAT: bad header magic".
+                * But for the kernel which also use ELF FD-PIC format, this
+                * error message is confusing.
                 * because a lot of people do not manage to produce good
-                * flat binaries,  we leave this printk to help them realise
-                * the problem.  We only print the error if its not a script 
file
                 */
-               if (strncmp(hdr->magic, "#!", 2))
-                       printk("BINFMT_FLAT: bad header magic\n");
                ret = -ENOEXEC;
                goto err;
        }
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
git-watchdog.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to