summaryrefslogtreecommitdiff
path: root/Documentation/s390/s390dbf.txt
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-05-05 10:24:42 +0400
committerThomas Gleixner <tglx@linutronix.de>2013-05-05 10:27:03 +0400
commitf99e44a7f3352d7131c7526207f153f13ec5acd4 (patch)
tree0f448b21128c478053ee7f7765b865954c4eebe8 /Documentation/s390/s390dbf.txt
parentfd29f424d458118f02e89596505c68a63dcb3007 (diff)
parentce857229e0c3adc211944a13a5579ef84fd7b4af (diff)
downloadlinux-f99e44a7f3352d7131c7526207f153f13ec5acd4.tar.xz
Merge branch 'linus' into core/urgent
Update with Linus tree so fixes for the same can be applied. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/s390/s390dbf.txt')
-rw-r--r--Documentation/s390/s390dbf.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/s390/s390dbf.txt b/Documentation/s390/s390dbf.txt
index ae66f9b90a25..fcaf0b4efba2 100644
--- a/Documentation/s390/s390dbf.txt
+++ b/Documentation/s390/s390dbf.txt
@@ -143,7 +143,8 @@ Parameter: id: handle for debug log
Return Value: none
-Description: frees memory for a debug log
+Description: frees memory for a debug log and removes all registered debug
+ views.
Must not be called within an interrupt handler
---------------------------------------------------------------------------