X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=scripts%2Fmod%2Fmodpost.c;h=2806a5c528c8c51d584f8019dffd7e6bab41573b;hb=76954527fe05354add150737aa1b9a6baa4a6ee5;hp=42e949cbc255c6494c7c85e8e5e0ce4c678c8d8c;hpb=ef98f9cfe20d8ca063365d46d4ab2b85eeeb324f;p=linux-2.6-microblaze.git

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 42e949cbc255..2806a5c528c8 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1180,7 +1180,8 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
 
 static inline int is_arm_mapping_symbol(const char *str)
 {
-	return str[0] == '$' && strchr("axtd", str[1])
+	return str[0] == '$' &&
+	       (str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x')
 	       && (str[2] == '\0' || str[2] == '.');
 }
 
@@ -1883,8 +1884,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
  * to find all references to a section that reference a section that will
  * be discarded and warns about it.
  **/
-static void check_sec_ref(struct module *mod, const char *modname,
-			  struct elf_info *elf)
+static void check_sec_ref(const char *modname, struct elf_info *elf)
 {
 	int i;
 	Elf_Shdr *sechdrs = elf->sechdrs;
@@ -1906,7 +1906,7 @@ static char *remove_dot(char *s)
 
 	if (n && s[n]) {
 		size_t m = strspn(s + n + 1, "0123456789");
-		if (m && (s[n + m] == '.' || s[n + m] == 0))
+		if (m && (s[n + m + 1] == '.' || s[n + m + 1] == 0))
 			s[n] = 0;
 
 		/* strip trailing .prelink */
@@ -2090,7 +2090,7 @@ static void read_symbols(const char *modname)
 		}
 	}
 
-	check_sec_ref(mod, modname, &info);
+	check_sec_ref(modname, &info);
 
 	if (!mod->is_vmlinux) {
 		version = get_modinfo(&info, "version");