Re: [for-next][PATCH 16/18] ftrace/rcu: Mark functions that are RCUunsafe

From: Steven Rostedt
Date: Wed Sep 04 2013 - 12:43:45 EST


On Wed, 04 Sep 2013 10:36:08 -0400
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx>
>
>
> diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
> index aa34411..911a61c 100644
> --- a/kernel/rcutiny.c
> +++ b/kernel/rcutiny.c

Wu's bot discovered that rcutiny.c is missing an include to ftrace.h.

Here's the change I made to this, and will rebase linux-next again to
have this. (Hopefully, Stephen hasn't pulled this branch in yet).

diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index 911a61c..abdfe28 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -28,6 +28,7 @@
#include <linux/rcupdate.h>
#include <linux/kernel.h>
#include <linux/export.h>
+#include <linux/ftrace.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/types.h>

-- Steve


> @@ -173,6 +173,7 @@ void rcu_irq_enter(void)
> local_irq_restore(flags);
> }
> EXPORT_SYMBOL_GPL(rcu_irq_enter);
> +FTRACE_UNSAFE_RCU(rcu_irq_enter);
>
> #ifdef CONFIG_DEBUG_LOCK_ALLOC
>
> diff --git a/kernel/rcutree.c b/kernel/rcutree.c
> index 068de3a..ca53562 100644
> --- a/kernel/rcutree.c
> +++ b/kernel/rcutree.c
> @@ -53,6 +53,7 @@
> #include <linux/delay.h>
> #include <linux/stop_machine.h>
> #include <linux/random.h>
> +#include <linux/ftrace.h>
>
> #include "rcutree.h"
> #include <trace/events/rcu.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/