5 files changed, 40 insertions, 3 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index a4d74344d805..f2bbea900700 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2656,6 +2656,7 @@ sub process {
 # check for semaphores used as mutexes
                 if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) {
                         WARN("consider using a completion\n" . $herecurr);
+
                 }
 # recommend strict_strto* over simple_strto*
                 if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
@@ -2740,6 +2741,16 @@ sub process {
                                 WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
                         }
                 }
+
+# check for lockdep_set_novalidate_class
+                if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ ||
+                    $line =~ /__lockdep_no_validate__\s*\)/ ) {
+                        if ($realfile !~ m@^kernel/lockdep@ &&
+                            $realfile !~ m@^include/linux/lockdep@ &&
+                            $realfile !~ m@^drivers/base/core@) {
+                                ERROR("lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr);
+                        }
+                }
         }
 
         # If we have no input at all, then there is nothing to report on
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index b6b2a46af14c..25d1ec4ca28a 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -72,7 +72,7 @@ int file_write_dep(const char *name)
 }
 
 
-/* Allocate initial growable sting */
+/* Allocate initial growable string */
 struct gstr str_new(void)
 {
         struct gstr gs;
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 808c20d81f8d..5758aab0d8bb 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -796,6 +796,28 @@ static int do_platform_entry(const char *filename,
         return 1;
 }
 
+static int do_mdio_entry(const char *filename,
+                         struct mdio_device_id *id, char *alias)
+{
+        int i;
+
+        alias += sprintf(alias, MDIO_MODULE_PREFIX);
+
+        for (i = 0; i < 32; i++) {
+                if (!((id->phy_id_mask >> (31-i)) & 1))
+                        *(alias++) = '?';
+                else if ((id->phy_id >> (31-i)) & 1)
+                        *(alias++) = '1';
+                else
+                        *(alias++) = '0';
+        }
+
+        /* Terminate the string */
+        *alias = 0;
+
+        return 1;
+}
+
 /* Looks like: zorro:iN. */
 static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
                           char *alias)
@@ -966,6 +988,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct platform_device_id), "platform",
                          do_platform_entry, mod);
+        else if (sym_is(symname, "__mod_mdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct mdio_device_id), "mdio",
+                         do_mdio_entry, mod);
         else if (sym_is(symname, "__mod_zorro_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct zorro_device_id), "zorro",
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 47bdd2f99b78..fa27f3dac769 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#       Output a simple RPM spec file that uses no fancy features requring
+#       Output a simple RPM spec file that uses no fancy features requiring
 #       RPM v4. This is intended to work with any RPM distro.
 #
 #       The only gothic bit here is redefining install_post to avoid
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 24626968055d..58a12c278706 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
         fprintf(fout, "\n");
 
         for (i = 1; i < isids_len; i++) {
-                char *s = initial_sid_to_string[i];
+                const char *s = initial_sid_to_string[i];
                 fprintf(fout, "#define SECINITSID_%s", s);
                 for (j = 0; j < max(1, 40 - strlen(s)); j++)
                         fprintf(fout, " ");