Commit-ID:  9cf5bcc3ddc4f291f54e680b75ad3957e2d468f9
Gitweb:     http://git.kernel.org/tip/9cf5bcc3ddc4f291f54e680b75ad3957e2d468f9
Author:     Ingo Molnar [off-list ref]
AuthorDate: Wed, 3 Jun 2015 12:37:29 +0200
Committer:  Ingo Molnar [off-list ref]
CommitDate: Wed, 3 Jun 2015 12:51:40 +0200

Documentation/features/debug: Add feature description and arch support status file for 'kprobes-on-ftrace'

Cc: <redacted>
Cc: <redacted>
Cc: <redacted>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <redacted>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 .../features/debug/{KASAN => kprobes-on-ftrace}/arch-support.txt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/features/debug/KASAN/arch-support.txt b/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt
similarity index 85%
copy from Documentation/features/debug/KASAN/arch-support.txt
copy to Documentation/features/debug/kprobes-on-ftrace/arch-support.txt
index 14531da..40f44d0 100644
--- a/Documentation/features/debug/KASAN/arch-support.txt
+++ b/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt

@@ -1,7 +1,7 @@
 #
-# Feature name:          KASAN
-#         Kconfig:       HAVE_ARCH_KASAN
-#         description:   arch supports the KASAN runtime memory checker
+# Feature name:          kprobes-on-ftrace
+#         Kconfig:       HAVE_KPROBES_ON_FTRACE
+#         description:   arch supports combined kprobes and ftrace live patching
 #
     -----------------------
     |         arch |status|