2 files changed, 25 insertions, 3 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 3208a3a7e7fe..acd8c4a8e3e0 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1828,6 +1828,25 @@ sub reset_state {
     $state = 0;
 }
 
+sub tracepoint_munge($) {
+        my $file = shift;
+        my $tracepointname = 0;
+        my $tracepointargs = 0;
+
+        if($prototype =~ m/TRACE_EVENT\((.*?),/) {
+                $tracepointname = $1;
+        }
+        if($prototype =~ m/TP_PROTO\((.*?)\)/) {
+                $tracepointargs = $1;
+        }
+        if (($tracepointname eq 0) || ($tracepointargs eq 0)) {
+                print STDERR "Warning(${file}:$.): Unrecognized tracepoint format: \n".
+                             "$prototype\n";
+        } else {
+                $prototype = "static inline void trace_$tracepointname($tracepointargs)";
+        }
+}
+
 sub syscall_munge() {
         my $void = 0;
 
@@ -1882,6 +1901,9 @@ sub process_state3_function($$) {
         if ($prototype =~ /SYSCALL_DEFINE/) {
                 syscall_munge();
         }
+        if ($prototype =~ /TRACE_EVENT/) {
+                tracepoint_munge($file);
+        }
         dump_function($prototype, $file);
         reset_state();
     }
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 409596eca124..0fae7da0529c 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -26,7 +26,7 @@
 # which will also be the location of that section after final link.
 # e.g.
 #
-#  .section ".text.sched"
+#  .section ".sched.text", "ax"
 #  .globl my_func
 #  my_func:
 #        [...]
@@ -39,7 +39,7 @@
 #        [...]
 #
 # Both relocation offsets for the mcounts in the above example will be
-# offset from .text.sched. If we make another file called tmp.s with:
+# offset from .sched.text. If we make another file called tmp.s with:
 #
 #  .section __mcount_loc
 #  .quad  my_func + 0x5
@@ -51,7 +51,7 @@
 # But this gets hard if my_func is not globl (a static function).
 # In such a case we have:
 #
-#  .section ".text.sched"
+#  .section ".sched.text", "ax"
 #  my_func:
 #        [...]
 #        call mcount  (offset: 0x5)