Merge tag 'kbuild-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[platform/kernel/linux-rpi.git] / scripts / mod / modpost.c

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 9321c0a..efff807 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -519,9 +519,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
                if (!nobits && sechdrs[i].sh_offset > info->size) {
-                       fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
-                             "sizeof(*hrd)=%zu\n", filename,
-                             (unsigned long)sechdrs[i].sh_offset,
+                       fatal("%s is truncated. sechdrs[i].sh_offset=%lu > sizeof(*hrd)=%zu\n",
+                             filename, (unsigned long)sechdrs[i].sh_offset,
                              sizeof(*hdr));
                        return 0;
                }
@@ -823,10 +822,10 @@ static void check_section(const char *modname, struct elf_info *elf,
 #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
 
 #define DATA_SECTIONS ".data", ".data.rel"
-#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
+#define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \
                ".kprobes.text", ".cpuidle.text", ".noinstr.text"
 #define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
-               ".fixup", ".entry.text", ".exception.text", ".text.*", \
+               ".fixup", ".entry.text", ".exception.text", \
                ".coldtext", ".softirqentry.text"
 
 #define INIT_SECTIONS      ".init.*"
@@ -1355,8 +1354,7 @@ static void report_extable_warnings(const char* modname, struct elf_info* elf,
        get_pretty_name(is_function(tosym),
                        &to_pretty_name, &to_pretty_name_p);
 
-       warn("%s(%s+0x%lx): Section mismatch in reference"
-            " from the %s %s%s to the %s %s:%s%s\n",
+       warn("%s(%s+0x%lx): Section mismatch in reference from the %s %s%s to the %s %s:%s%s\n",
             modname, fromsec, (long)r->r_offset, from_pretty_name,
             fromsym_name, from_pretty_name_p,
             to_pretty_name, tosec, tosym_name, to_pretty_name_p);
@@ -1871,11 +1869,9 @@ static void read_symbols_from_files(const char *filename)
        FILE *in = stdin;
        char fname[PATH_MAX];
 
-       if (strcmp(filename, "-") != 0) {
-               in = fopen(filename, "r");
-               if (!in)
-                       fatal("Can't open filenames file %s: %m", filename);
-       }
+       in = fopen(filename, "r");
+       if (!in)
+               fatal("Can't open filenames file %s: %m", filename);
 
        while (fgets(fname, PATH_MAX, in) != NULL) {
                if (strends(fname, "\n"))
@@ -1883,8 +1879,7 @@ static void read_symbols_from_files(const char *filename)
                read_symbols(fname);
        }
 
-       if (in != stdin)
-               fclose(in);
+       fclose(in);
 }
 
 #define SZ 500