1 files changed, 4 insertions, 5 deletions

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 33764fd6db66..0498b181dd52 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -20,7 +20,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/a.out.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/string.h>
@@ -444,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;
         }