Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/acme/linux-2.6 into perf/core
mariux64 · Jul 6, 2010 · 8bd0e1b · 8bd0e1b
2 parents 39ef13a + b7dcb85
commit 8bd0e1b
Show file tree

Hide file tree

Showing 7 changed files with 523 additions and 165 deletions.
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
@@ -42,7 +42,7 @@ Synopsis of kprobe_events
   +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)
   NAME=FETCHARG : Set NAME as the argument name of FETCHARG.
   FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types
-		  (u8/u16/u32/u64/s8/s16/s32/s64) are supported.
+		  (u8/u16/u32/u64/s8/s16/s32/s64) and string are supported.
 
   (*) only for return probe.
   (**) this is useful for fetching a field of data structures.