diff --git a/[refs] b/[refs]
index 80e6db6bbc93..c42ce85f9fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d926f2756392c6909f60e0c9fe2a09d5462e376
+refs/heads/master: 0da85c09b44bfea07e63ed5324aabc7cfc8a889a
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 79213c0785d2..e810196bf2f2 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -723,7 +723,7 @@ int do_one_initcall(initcall_t fn)
 		disable_boot_trace();
 		rettime = ktime_get();
 		delta = ktime_sub(rettime, calltime);
-		ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+		ret.duration = (unsigned long long) delta.tv64 >> 10;
 		trace_boot_ret(&ret, fn);
 		printk("initcall %pF returned %d after %Ld usecs\n", fn,
 			ret.result, ret.duration);
diff --git a/trunk/scripts/recordmcount.pl b/trunk/scripts/recordmcount.pl
index eeac71c87c66..9f75438f65e2 100755
--- a/trunk/scripts/recordmcount.pl
+++ b/trunk/scripts/recordmcount.pl
@@ -170,6 +170,17 @@
     $objcopy .= " -O elf32-i386";
     $cc .= " -m32";
 
+} elsif ($arch eq "sh") {
+    $section_regex = "Disassembly of section\\s+(\\S+):";
+    $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
+    $type = ".long";
+
+    # force flags for this arch
+    $ld .= " -m shlelf_linux";
+    $objcopy .= " -O elf32-sh-linux";
+    $cc .= " -m32";
+
 } else {
     die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
 }