Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.25-rc1-git4 /fs/binfmt_flat.c

Filename:/fs/binfmt_flat.c
Lines Added:4
Lines Deleted:4
Also changed in: (Previous) 2.6.25-rc1  2.6.24-git22  2.6.24-git21  2.6.24-git20  2.6.24-git19  2.6.24 
(Following) 2.6.25-rc2  2.6.25-rc3  2.6.25-rc4  2.6.25-rc5  2.6.25-rc6  2.6.25-rc7 

Location
[  2.6.25-rc1-git4
  [  fs
     o  binfmt_flat.c

Patch

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index d8a02f1..0498b18 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -443,12 +443,12 @@ static int load_flat_file(struct linux_binprm * bprm,
 
    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;
    }


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.