Merge branch 'hugepage-fallbacks' (hugepatch patches from David Rientjes)

[linux.git] / scripts / recordmcount.h

diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index 3796eb37fb1268fcc885961a81c346d794c65367..8f0a278ce0af2e985e3fd80047119c93851bba87 100644 (file)
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -463,16 +463,14 @@ static int find_secsym_ndx(unsigned const txtndx,
        }
        fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
                txtndx, txtname);
-       cleanup();
        return -1;
 }
 
 /* Evade ISO C restriction: no declaration after statement in has_rel_mcount. */
-static char const *
-__has_rel_mcount(Elf_Shdr const *const relhdr,  /* is SHT_REL or SHT_RELA */
-                Elf_Shdr const *const shdr0,
-                char const *const shstrtab,
-                char const *const fname)
+static char const * __has_rel_mcount(Elf_Shdr const *const relhdr, /* reltype */
+                                    Elf_Shdr const *const shdr0,
+                                    char const *const shstrtab,
+                                    char const *const fname)
 {
        /* .sh_info depends on .sh_type == SHT_REL[,A] */
        Elf_Shdr const *const txthdr = &shdr0[w(relhdr->sh_info)];
@@ -481,7 +479,6 @@ __has_rel_mcount(Elf_Shdr const *const relhdr,  /* is SHT_REL or SHT_RELA */
        if (strcmp("__mcount_loc", txtname) == 0) {
                fprintf(stderr, "warning: __mcount_loc already exists: %s\n",
                        fname);
-               cleanup();
                return already_has_rel_mcount;
        }
        if (w(txthdr->sh_type) != SHT_PROGBITS ||
@@ -524,8 +521,8 @@ static unsigned tot_relsize(Elf_Shdr const *const shdr0,
 
 
 /* Overall supervision for Elf32 ET_REL file. */
-static int
-do_func(Elf_Ehdr *const ehdr, char const *const fname, unsigned const reltype)
+static int do_func(Elf_Ehdr *const ehdr, char const *const fname,
+                  unsigned const reltype)
 {
        Elf_Shdr *const shdr0 = (Elf_Shdr *)(_w(ehdr->e_shoff)
                + (void *)ehdr);