summaryrefslogtreecommitdiff
path: root/scripts/sortextable.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
commit2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch)
tree2eb2819e880060486d36665113e8da5c460383fc /scripts/sortextable.c
parent6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff)
parent8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff)
Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm2200
regmap: Range API changes A bunch of updates to the regmap range support, the most important ones being to rename "n_ranges" to "num_ranges" for consistency and to allow block writes to cross page boundaries, making things more transparent.
Diffstat (limited to 'scripts/sortextable.c')
-rw-r--r--scripts/sortextable.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 6acf83449105..f19ddc47304c 100644
--- 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 */