Merge commit 'v2.6.38-rc1' into kbuild/packaging

1 files changed, 2 insertions, 6 deletions

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index e3902fb39afd..60dd3eb9366e 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -107,12 +107,8 @@ static int read_symbol(FILE *in, struct sym_entry *s)
 
         rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
         if (rc != 3) {
-                if (rc != EOF) {
-                        /* skip line. sym is used as dummy to
-                         * shut of "warn_unused_result" warning.
-                         */
-                        sym = fgets(str, 500, in);
-                }
+                if (rc != EOF && fgets(str, 500, in) == NULL)
+                        fprintf(stderr, "Read error or end of file.\n");
                 return -1;
         }