Merge branch 'linus' into timers/urgent

Get upstream changes so dependent patches can be applied.

5 files changed, 92 insertions, 6 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index bb831d49bcfd..e63af4e19382 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -259,7 +259,7 @@ ifneq ($(SKIP_STACK_VALIDATION),1)
 
 __objtool_obj := $(objtree)/tools/objtool/objtool
 
-objtool_args = $(if $(CONFIG_ORC_UNWINDER),orc generate,check)
+objtool_args = $(if $(CONFIG_UNWINDER_ORC),orc generate,check)
 
 ifndef CONFIG_FRAME_POINTER
 objtool_args += --no-fp
diff --git a/scripts/documentation-file-ref-check b/scripts/documentation-file-ref-check
new file mode 100755
index 000000000000..bc1659900e89
--- /dev/null
+++ b/scripts/documentation-file-ref-check
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Treewide grep for references to files under Documentation, and report
+# non-existing files in stderr.
+
+for f in $(git ls-files); do
+        for ref in $(grep -ho "Documentation/[A-Za-z0-9_.,~/*+-]*" "$f"); do
+                # presume trailing . and , are not part of the name
+                ref=${ref%%[.,]}
+
+                # use ls to handle wildcards
+                if ! ls $ref >/dev/null 2>&1; then
+                        echo "$f: $ref" >&2
+                fi
+        done
+done
diff --git a/scripts/find-unused-docs.sh b/scripts/find-unused-docs.sh
new file mode 100755
index 000000000000..3f46f8977dc4
--- /dev/null
+++ b/scripts/find-unused-docs.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# (c) 2017, Jonathan Corbet <corbet@lwn.net>
+#           sayli karnik <karniksayli1995@gmail.com>
+#
+# This script detects files with kernel-doc comments for exported functions
+# that are not included in documentation.
+#
+# usage: Run 'scripts/find-unused-docs.sh directory' from top level of kernel
+#        tree.
+#
+# example: $scripts/find-unused-docs.sh drivers/scsi
+#
+# Licensed under the terms of the GNU GPL License
+
+if ! [ -d "Documentation" ]; then
+        echo "Run from top level of kernel tree"
+        exit 1
+fi
+
+if [ "$#" -ne 1 ]; then
+        echo "Usage: scripts/find-unused-docs.sh directory"
+        exit 1
+fi
+
+if ! [ -d "$1" ]; then
+        echo "Directory $1 doesn't exist"
+        exit 1
+fi
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+cd ..
+
+cd Documentation/
+
+echo "The following files contain kerneldoc comments for exported functions \
+that are not used in the formatted documentation"
+
+# FILES INCLUDED
+
+files_included=($(grep -rHR ".. kernel-doc" --include \*.rst | cut -d " " -f 3))
+
+declare -A FILES_INCLUDED
+
+for each in "${files_included[@]}"; do
+        FILES_INCLUDED[$each]="$each"
+        done
+
+cd ..
+
+# FILES NOT INCLUDED
+
+for file in `find $1 -name '*.c'`; do
+
+        if [[ ${FILES_INCLUDED[$file]+_} ]]; then
+        continue;
+        fi
+        str=$(scripts/kernel-doc -text -export "$file" 2>/dev/null)
+        if [[ -n "$str" ]]; then
+        echo "$file"
+        fi
+        done
+
diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
index 4d1ea96e8794..a18bca720995 100755
--- a/scripts/headers_install.sh
+++ b/scripts/headers_install.sh
@@ -34,7 +34,7 @@ do
         sed -r \
                 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
                 -e 's/__attribute_const__([ \t]|$)/\1/g' \
-                -e 's@^#include <linux/compiler.h>@@' \
+                -e 's@^#include <linux/compiler(|_types).h>@@' \
                 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
                 -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
                 -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9d3eafea58f0..67d051edd615 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2168,7 +2168,7 @@ sub dump_struct($$) {
     my $nested;
 
     if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
-        #my $decl_type = $1;
+        my $decl_type = $1;
         $declaration_name = $2;
         my $members = $3;
 
@@ -2194,7 +2194,7 @@ sub dump_struct($$) {
         $members =~ s/DECLARE_HASHTABLE\s*\(([^,)]+), ([^,)]+)\)/unsigned long $1\[1 << (($2) - 1)\]/gos;
 
         create_parameterlist($members, ';', $file);
-        check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
+        check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual, $nested);
 
         output_declaration($declaration_name,
                            'struct',
@@ -2226,6 +2226,8 @@ sub dump_enum($$) {
     if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
         $declaration_name = $1;
         my $members = $2;
+        my %_members;
+
         $members =~ s/\s+$//;
 
         foreach my $arg (split ',', $members) {
@@ -2236,9 +2238,16 @@ sub dump_enum($$) {
                 print STDERR "${file}:$.: warning: Enum value '$arg' ".
                     "not described in enum '$declaration_name'\n";
             }
-
+            $_members{$arg} = 1;
         }
 
+        while (my ($k, $v) = each %parameterdescs) {
+            if (!exists($_members{$k})) {
+             print STDERR "${file}:$.: warning: Excess enum value " .
+                          "'$k' description in '$declaration_name'\n";
+            }
+        }
+
         output_declaration($declaration_name,
                            'enum',
                            {'enum' => $declaration_name,
@@ -2506,7 +2515,7 @@ sub check_sections($$$$$$) {
                         } else {
                                 if ($nested !~ m/\Q$sects[$sx]\E/) {
                                     print STDERR "${file}:$.: warning: " .
-                                        "Excess struct/union/enum/typedef member " .
+                                        "Excess $decl_type member " .
                                         "'$sects[$sx]' " .
                                         "description in '$decl_name'\n";
                                     ++$warnings;