Merge tag 'x86-mm-2020-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 12938d4..c5d96e3 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -992,6 +992,7 @@ struct task_struct {
        unsigned int                    hardirq_disable_event;
        int                             hardirqs_enabled;
        int                             hardirq_context;
+       u64                             hardirq_chain_key;
        unsigned long                   softirq_disable_ip;
        unsigned long                   softirq_enable_ip;
        unsigned int                    softirq_disable_event;
@@ -1246,6 +1247,9 @@ struct task_struct {
 
        /* KCOV sequence number: */
        int                             kcov_sequence;
+
+       /* Collect coverage from softirq context: */
+       unsigned int                    kcov_softirq;
 #endif
 
 #ifdef CONFIG_MEMCG