Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[karo-tx-linux.git] / scripts / sortextable.c

diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 6acf834491050237548163230a2b89e7e53b9b61..f19ddc47304c8f1e2a52a4acff95697fa9b3c902 100644 (file)
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -161,7 +161,7 @@ typedef void (*table_sort_t)(char *, int);
 #define SORTEXTABLE_64
 #include "sortextable.h"
 
-static int compare_x86_table(const void *a, const void *b)
+static int compare_relative_table(const void *a, const void *b)
 {
        int32_t av = (int32_t)r(a);
        int32_t bv = (int32_t)r(b);
@@ -173,7 +173,7 @@ static int compare_x86_table(const void *a, const void *b)
        return 0;
 }
 
-static void sort_x86_table(char *extab_image, int image_size)
+static void sort_relative_table(char *extab_image, int image_size)
 {
        int i;
 
@@ -188,7 +188,7 @@ static void sort_x86_table(char *extab_image, int image_size)
                i += 4;
        }
 
-       qsort(extab_image, image_size / 8, 8, compare_x86_table);
+       qsort(extab_image, image_size / 8, 8, compare_relative_table);
 
        /* Now denormalize. */
        i = 0;
@@ -245,9 +245,9 @@ do_file(char const *const fname)
                break;
        case EM_386:
        case EM_X86_64:
-               custom_sort = sort_x86_table;
-               break;
        case EM_S390:
+               custom_sort = sort_relative_table;
+               break;
        case EM_MIPS:
                break;
        }  /* end switch */