diff options
| -rw-r--r-- | include/linux/kmemtrace.h | 2 | ||||
| -rw-r--r-- | include/trace/define_trace.h | 2 | ||||
| -rw-r--r-- | include/trace/events/irq.h (renamed from include/trace/irq.h) | 0 | ||||
| -rw-r--r-- | include/trace/events/kmem.h (renamed from include/trace/kmem.h) | 0 | ||||
| -rw-r--r-- | include/trace/events/lockdep.h (renamed from include/trace/lockdep.h) | 0 | ||||
| -rw-r--r-- | include/trace/events/sched.h (renamed from include/trace/sched.h) | 0 | ||||
| -rw-r--r-- | include/trace/events/skb.h (renamed from include/trace/skb.h) | 0 | ||||
| -rw-r--r-- | kernel/exit.c | 2 | ||||
| -rw-r--r-- | kernel/fork.c | 3 | ||||
| -rw-r--r-- | kernel/irq/handle.c | 2 | ||||
| -rw-r--r-- | kernel/kthread.c | 2 | ||||
| -rw-r--r-- | kernel/lockdep.c | 2 | ||||
| -rw-r--r-- | kernel/sched.c | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 2 | ||||
| -rw-r--r-- | kernel/softirq.c | 2 | ||||
| -rw-r--r-- | kernel/trace/ftrace.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_sched_switch.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_sched_wakeup.c | 2 | ||||
| -rw-r--r-- | mm/util.c | 2 | ||||
| -rw-r--r-- | net/core/drop_monitor.c | 2 | ||||
| -rw-r--r-- | net/core/net-traces.c | 2 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
22 files changed, 18 insertions, 17 deletions
diff --git a/include/linux/kmemtrace.h b/include/linux/kmemtrace.h index 15c45a2..b616d39 100644 --- a/include/linux/kmemtrace.h +++ b/include/linux/kmemtrace.h @@ -9,7 +9,7 @@ #ifdef __KERNEL__ -#include <trace/kmem.h> +#include <trace/events/kmem.h> #ifdef CONFIG_KMEMTRACE extern void kmemtrace_init(void); diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index 980eb66..1886941 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h @@ -43,7 +43,7 @@ #endif #ifndef TRACE_INCLUDE_PATH -# define __TRACE_INCLUDE(system) <trace/system.h> +# define __TRACE_INCLUDE(system) <trace/events/system.h> # define UNDEF_TRACE_INCLUDE_FILE #else # define __TRACE_INCLUDE(system) __stringify(TRACE_INCLUDE_PATH/system.h) diff --git a/include/trace/irq.h b/include/trace/events/irq.h index 75e3468..75e3468 100644 --- a/include/trace/irq.h +++ b/include/trace/events/irq.h diff --git a/include/trace/kmem.h b/include/trace/events/kmem.h index c22c42f..c22c42f 100644 --- a/include/trace/kmem.h +++ b/include/trace/events/kmem.h diff --git a/include/trace/lockdep.h b/include/trace/events/lockdep.h index 45e326b..45e326b 100644 --- a/include/trace/lockdep.h +++ b/include/trace/events/lockdep.h diff --git a/include/trace/sched.h b/include/trace/events/sched.h index ffa1cab..ffa1cab 100644 --- a/include/trace/sched.h +++ b/include/trace/events/sched.h diff --git a/include/trace/skb.h b/include/trace/events/skb.h index 1e8fabb..1e8fabb 100644 --- a/include/trace/skb.h +++ b/include/trace/events/skb.h diff --git a/kernel/exit.c b/kernel/exit.c index 2fe9d2c..cab535c 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -48,7 +48,7 @@ #include <linux/tracehook.h> #include <linux/fs_struct.h> #include <linux/init_task.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include <asm/uaccess.h> #include <asm/unistd.h> diff --git a/kernel/fork.c b/kernel/fork.c index 4bebf26..085f73e 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -61,7 +61,6 @@ #include <linux/proc_fs.h> #include <linux/blkdev.h> #include <linux/fs_struct.h> -#include <trace/sched.h> #include <linux/magic.h> #include <asm/pgtable.h> @@ -71,6 +70,8 @@ #include <asm/cacheflush.h> #include <asm/tlbflush.h> +#include <trace/events/sched.h> + /* * Protected counters by write_lock_irq(&tasklist_lock) */ diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 983d8be..37c6363 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -20,7 +20,7 @@ #include <linux/bootmem.h> #define CREATE_TRACE_POINTS -#include <trace/irq.h> +#include <trace/events/irq.h> #include "internals.h" diff --git a/kernel/kthread.c b/kernel/kthread.c index e1c7692..41c88fe 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -13,7 +13,7 @@ #include <linux/file.h> #include <linux/module.h> #include <linux/mutex.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #define KTHREAD_NICE_LEVEL (-5) diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 257f21a..47b201e 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -48,7 +48,7 @@ #include "lockdep_internals.h" #define CREATE_TRACE_POINTS -#include <trace/lockdep.h> +#include <trace/events/lockdep.h> #ifdef CONFIG_PROVE_LOCKING int prove_locking = 1; diff --git a/kernel/sched.c b/kernel/sched.c index e6d4518..9f7ffd0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -79,7 +79,7 @@ #include "sched_cpupri.h" #define CREATE_TRACE_POINTS -#include <trace/sched.h> +#include <trace/events/sched.h> /* * Convert user-nice values [ -20 ... 0 ... 19 ] diff --git a/kernel/signal.c b/kernel/signal.c index 1d5703f..94ec0a4 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -27,7 +27,7 @@ #include <linux/freezer.h> #include <linux/pid_namespace.h> #include <linux/nsproxy.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include <asm/param.h> #include <asm/uaccess.h> diff --git a/kernel/softirq.c b/kernel/softirq.c index a2d9b45..7ab9dfd 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -24,7 +24,7 @@ #include <linux/ftrace.h> #include <linux/smp.h> #include <linux/tick.h> -#include <trace/irq.h> +#include <trace/events/irq.h> #include <asm/irq.h> /* diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 8e6a0b5..a234889 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -29,7 +29,7 @@ #include <linux/list.h> #include <linux/hash.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include <asm/ftrace.h> diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c index 9d8cccd..a98106d 100644 --- a/kernel/trace/trace_sched_switch.c +++ b/kernel/trace/trace_sched_switch.c @@ -10,7 +10,7 @@ #include <linux/kallsyms.h> #include <linux/uaccess.h> #include <linux/ftrace.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include "trace.h" diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index 5bc00e8f..b8b13c5 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -15,7 +15,7 @@ #include <linux/kallsyms.h> #include <linux/uaccess.h> #include <linux/ftrace.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include "trace.h" @@ -7,7 +7,7 @@ #include <asm/uaccess.h> #define CREATE_TRACE_POINTS -#include <trace/kmem.h> +#include <trace/events/kmem.h> /** * kstrdup - allocate space for and copy an existing string diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 9fd0dc3..b75b6ce 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -23,7 +23,7 @@ #include <linux/bitops.h> #include <net/genetlink.h> -#include <trace/skb.h> +#include <trace/events/skb.h> #include <asm/unaligned.h> diff --git a/net/core/net-traces.c b/net/core/net-traces.c index 8017720..499a67e 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -24,6 +24,6 @@ #include <asm/bitops.h> #define CREATE_TRACE_POINTS -#include <trace/skb.h> +#include <trace/events/skb.h> EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ce6356c..12806b8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -65,7 +65,7 @@ #include <asm/uaccess.h> #include <asm/system.h> -#include <trace/skb.h> +#include <trace/events/skb.h> #include "kmap_skb.h" |
