1 files changed, 44 insertions, 17 deletions

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 1f11d848532a..c912137f80e2 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -31,17 +31,16 @@
 
 #define KSYM_NAME_LEN           128
 
-
 struct sym_entry {
         unsigned long long addr;
         unsigned int len;
+        unsigned int start_pos;
         unsigned char *sym;
 };
 
-
 static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
-static unsigned long long _text, _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;
+static unsigned long long _text, _stext, _etext, _sinittext, _einittext;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
 
@@ -99,10 +98,6 @@ static int read_symbol(FILE *in, struct sym_entry *s)
                 _sinittext = s->addr;
         else if (strcmp(sym, "_einittext") == 0)
                 _einittext = s->addr;
-        else if (strcmp(sym, "_sextratext") == 0)
-                _sextratext = s->addr;
-        else if (strcmp(sym, "_eextratext") == 0)
-                _eextratext = s->addr;
         else if (toupper(stype) == 'A')
         {
                 /* Keep these useful absolute symbols */
@@ -165,18 +160,18 @@ static int symbol_valid(struct sym_entry *s)
          * and inittext sections are discarded */
         if (!all_symbols) {
                 if ((s->addr < _stext || s->addr > _etext)
-                    && (s->addr < _sinittext || s->addr > _einittext)
-                    && (s->addr < _sextratext || s->addr > _eextratext))
+                    && (s->addr < _sinittext || s->addr > _einittext))
                         return 0;
                 /* Corner case.  Discard any symbols with the same value as
-                 * _etext _einittext or _eextratext; they can move between pass
-                 * 1 and 2 when the kallsyms data are added.  If these symbols
-                 * move then they may get dropped in pass 2, which breaks the
-                 * kallsyms rules.
+                 * _etext _einittext; they can move between pass 1 and 2 when
+                 * the kallsyms data are added.  If these symbols move then
+                 * they may get dropped in pass 2, which breaks the kallsyms
+                 * rules.
                  */
-                if ((s->addr == _etext && strcmp((char*)s->sym + offset, "_etext")) ||
-                    (s->addr == _einittext && strcmp((char*)s->sym + offset, "_einittext")) ||
-                    (s->addr == _eextratext && strcmp((char*)s->sym + offset, "_eextratext")))
+                if ((s->addr == _etext &&
+                                strcmp((char *)s->sym + offset, "_etext")) ||
+                    (s->addr == _einittext &&
+                                strcmp((char *)s->sym + offset, "_einittext")))
                         return 0;
         }
 
@@ -202,8 +197,10 @@ static void read_map(FILE *in)
                                 exit (1);
                         }
                 }
-                if (read_symbol(in, &table[table_cnt]) == 0)
+                if (read_symbol(in, &table[table_cnt]) == 0) {
+                        table[table_cnt].start_pos = table_cnt;
                         table_cnt++;
+                }
         }
 }
 
@@ -506,6 +503,35 @@ static void optimize_token_table(void)
         optimize_result();
 }
 
+static int compare_symbols(const void *a, const void *b)
+{
+        const struct sym_entry *sa;
+        const struct sym_entry *sb;
+        int wa, wb;
+
+        sa = a;
+        sb = b;
+
+        /* sort by address first */
+        if (sa->addr > sb->addr)
+                return 1;
+        if (sa->addr < sb->addr)
+                return -1;
+
+        /* sort by "weakness" type */
+        wa = (sa->sym[0] == 'w') || (sa->sym[0] == 'W');
+        wb = (sb->sym[0] == 'w') || (sb->sym[0] == 'W');
+        if (wa != wb)
+                return wa - wb;
+
+        /* sort by initial order, so that other symbols are left undisturbed */
+        return sa->start_pos - sb->start_pos;
+}
+
+static void sort_symbols(void)
+{
+        qsort(table, table_cnt, sizeof(struct sym_entry), compare_symbols);
+}
 
 int main(int argc, char **argv)
 {
@@ -527,6 +553,7 @@ int main(int argc, char **argv)
                 usage();
 
         read_map(stdin);
+        sort_symbols();
         optimize_token_table();
         write_src();