The patch titled
Subject: kernel-add-kcov-code-coverage-fix
has been removed from the -mm tree. Its filename was
kernel-add-kcov-code-coverage-fix.patch
This patch was dropped because it was folded into kernel-add-kcov-code-coverage.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: kernel-add-kcov-code-coverage-fix
make task_struct.kcov_mode have type `enum kcov_mode'.
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kcov.h | 8 ++++++++
include/linux/sched.h | 3 ++-
kernel/kcov.c | 8 --------
3 files changed, 10 insertions(+), 9 deletions(-)
diff -puN include/linux/kcov.h~kernel-add-kcov-code-coverage-fix include/linux/kcov.h
--- a/include/linux/kcov.h~kernel-add-kcov-code-coverage-fix
+++ a/include/linux/kcov.h
@@ -10,6 +10,14 @@ struct task_struct;
void kcov_task_init(struct task_struct *t);
void kcov_task_exit(struct task_struct *t);
+enum kcov_mode {
+ /*
+ * Tracing coverage collection mode.
+ * Covered PCs are collected in a per-task buffer.
+ */
+ KCOV_MODE_TRACE = 1,
+};
+
#else
static inline void kcov_task_init(struct task_struct *t) {}
diff -puN include/linux/sched.h~kernel-add-kcov-code-coverage-fix include/linux/sched.h
--- a/include/linux/sched.h~kernel-add-kcov-code-coverage-fix
+++ a/include/linux/sched.h
@@ -51,6 +51,7 @@ struct sched_param {
#include <linux/resource.h>
#include <linux/timer.h>
#include <linux/hrtimer.h>
+#include <linux/kcov.h>
#include <linux/task_io_accounting.h>
#include <linux/latencytop.h>
#include <linux/cred.h>
@@ -1823,7 +1824,7 @@ struct task_struct {
#endif /* CONFIG_TRACING */
#ifdef CONFIG_KCOV
/* Coverage collection mode enabled for this task (0 if disabled). */
- int kcov_mode;
+ enum kcov_mode kcov_mode;
/* Size of the kcov_area. */
unsigned kcov_size;
/* Buffer for coverage collection. */
diff -puN kernel/kcov.c~kernel-add-kcov-code-coverage-fix kernel/kcov.c
--- a/kernel/kcov.c~kernel-add-kcov-code-coverage-fix
+++ a/kernel/kcov.c
@@ -13,14 +13,6 @@
#include <linux/uaccess.h>
#include <linux/kcov.h>
-enum kcov_mode {
- /*
- * Tracing coverage collection mode.
- * Covered PCs are collected in a per-task buffer.
- */
- KCOV_MODE_TRACE = 1,
-};
-
/*
* kcov descriptor (one per opened debugfs file).
* State transitions of the descriptor:
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
kernel-add-kcov-code-coverage.patch
kernel-add-kcov-code-coverage-fix-2.patch
kernel-add-kcov-code-coverage-makefile-tweaks.patch
dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
