summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 18:31:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 18:31:42 -0700
commit147db6e9474b444149238b77ceae335ca20e7b4a (patch)
treefefae0ecba79917efbbf22054474271af8f291ae /Documentation
parent43908195e04ee27779a60c55b5bb47aebf1c46ae (diff)
parent9244489a7b69fe0746dc7cb3957f02e05bd1ceb0 (diff)
downloadlinux-147db6e9474b444149238b77ceae335ca20e7b4a.tar.gz
linux-147db6e9474b444149238b77ceae335ca20e7b4a.tar.bz2
linux-147db6e9474b444149238b77ceae335ca20e7b4a.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: handle archs that do not support irqs_disabled_flags
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ftrace.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt
index d330fe3103da..ea5a827395dd 100644
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
@@ -291,6 +291,9 @@ explains which is which.
CPU#: The CPU which the process was running on.
irqs-off: 'd' interrupts are disabled. '.' otherwise.
+ Note: If the architecture does not support a way to
+ read the irq flags variable, an 'X' will always
+ be printed here.
need-resched: 'N' task need_resched is set, '.' otherwise.