Merge branch 'cleanups'

Merge cleanups requested by Linus.

* cleanups: (3 commits)
  pnfs: Refactor the *_layout_mark_request_commit to use pnfs_layout_mark_request_commit
  nfs: Can call nfs_clear_page_commit() instead
  nfs: Provide and use helper functions for marking a page as unstable

3 files changed, 29 insertions, 16 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 649ce6844033..01df30af4d4a 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -234,8 +234,9 @@ sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
         "$(if $(part-of-module),1,0)" "$(@)";
 recordmcount_source := $(srctree)/scripts/recordmcount.pl
 endif
-cmd_record_mcount =                                             \
-        if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then    \
+cmd_record_mcount =                                             \
+        if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" =   \
+             "$(CC_FLAGS_FTRACE)" ]; then                       \
                 $(sub_cmd_record_mcount)                        \
         fi;
 endif
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index 91c4117637ae..7750e9c31483 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -311,6 +311,9 @@ struct token {
 
 static struct token *token_list;
 static unsigned nr_tokens;
+static _Bool verbose;
+
+#define debug(fmt, ...) do { if (verbose) printf(fmt, ## __VA_ARGS__); } while (0)
 
 static int directive_compare(const void *_key, const void *_pdir)
 {
@@ -322,21 +325,21 @@ static int directive_compare(const void *_key, const void *_pdir)
         dlen = strlen(dir);
         clen = (dlen < token->size) ? dlen : token->size;
 
-        //printf("cmp(%*.*s,%s) = ",
+        //debug("cmp(%*.*s,%s) = ",
         //       (int)token->size, (int)token->size, token->value,
         //       dir);
 
         val = memcmp(token->value, dir, clen);
         if (val != 0) {
-                //printf("%d [cmp]\n", val);
+                //debug("%d [cmp]\n", val);
                 return val;
         }
 
         if (dlen == token->size) {
-                //printf("0\n");
+                //debug("0\n");
                 return 0;
         }
-        //printf("%d\n", (int)dlen - (int)token->size);
+        //debug("%d\n", (int)dlen - (int)token->size);
         return dlen - token->size; /* shorter -> negative */
 }
 
@@ -515,13 +518,13 @@ static void tokenise(char *buffer, char *end)
         }
 
         nr_tokens = tix;
-        printf("Extracted %u tokens\n", nr_tokens);
+        debug("Extracted %u tokens\n", nr_tokens);
 
 #if 0
         {
                 int n;
                 for (n = 0; n < nr_tokens; n++)
-                        printf("Token %3u: '%*.*s'\n",
+                        debug("Token %3u: '%*.*s'\n",
                                n,
                                (int)token_list[n].size, (int)token_list[n].size,
                                token_list[n].value);
@@ -542,6 +545,7 @@ int main(int argc, char **argv)
         ssize_t readlen;
         FILE *out, *hdr;
         char *buffer, *p;
+        char *kbuild_verbose;
         int fd;
 
         if (argc != 4) {
@@ -550,6 +554,10 @@ int main(int argc, char **argv)
                 exit(2);
         }
 
+        kbuild_verbose = getenv("KBUILD_VERBOSE");
+        if (kbuild_verbose)
+                verbose = atoi(kbuild_verbose);
+
         filename = argv[1];
         outputname = argv[2];
         headername = argv[3];
@@ -748,11 +756,11 @@ static void build_type_list(void)
 
         qsort(type_index, nr, sizeof(type_index[0]), type_index_compare);
 
-        printf("Extracted %u types\n", nr_types);
+        debug("Extracted %u types\n", nr_types);
 #if 0
         for (n = 0; n < nr_types; n++) {
                 struct type *type = type_index[n];
-                printf("- %*.*s\n",
+                debug("- %*.*s\n",
                        (int)type->name->size,
                        (int)type->name->size,
                        type->name->value);
@@ -793,7 +801,7 @@ static void parse(void)
 
         } while (type++, !(type->flags & TYPE_STOP_MARKER));
 
-        printf("Extracted %u actions\n", nr_actions);
+        debug("Extracted %u actions\n", nr_actions);
 }
 
 static struct element *element_list;
@@ -1284,7 +1292,7 @@ static void render(FILE *out, FILE *hdr)
         }
 
         /* We do two passes - the first one calculates all the offsets */
-        printf("Pass 1\n");
+        debug("Pass 1\n");
         nr_entries = 0;
         root = &type_list[0];
         render_element(NULL, root->element, NULL);
@@ -1295,7 +1303,7 @@ static void render(FILE *out, FILE *hdr)
                 e->flags &= ~ELEMENT_RENDERED;
 
         /* And then we actually render */
-        printf("Pass 2\n");
+        debug("Pass 2\n");
         fprintf(out, "\n");
         fprintf(out, "static const unsigned char %s_machine[] = {\n",
                 grammar_name);
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 56ea99a12ab7..826470d7f000 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -242,8 +242,13 @@ if ($arch eq "x86_64") {
     $cc .= " -m32";
 
 } elsif ($arch eq "s390" && $bits == 64) {
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$";
-    $mcount_adjust = -14;
+    if ($cc =~ /-DCC_USING_HOTPATCH/) {
+        $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*brcl\\s*0,[0-9a-f]+ <([^\+]*)>\$";
+        $mcount_adjust = 0;
+    } else {
+        $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_390_(PC|PLT)32DBL\\s+_mcount\\+0x2\$";
+        $mcount_adjust = -14;
+    }
     $alignment = 8;
     $type = ".quad";
     $ld .= " -m elf64_s390";
@@ -255,7 +260,6 @@ if ($arch eq "x86_64") {
     # force flags for this arch
     $ld .= " -m shlelf_linux";
     $objcopy .= " -O elf32-sh-linux";
-    $cc .= " -m32";
 
 } elsif ($arch eq "powerpc") {
     $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";