From: Alexey Dobriyan <adobriyan@gmail•com>
To: Steven Rostedt <srostedt@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
mingo@redhat•com
Subject: Re: next-20081106: today's ftrace episode
Date: Thu, 6 Nov 2008 23:15:59 +0300 [thread overview]
Message-ID: <20081106201559.GA17602@x200.localdomain> (raw)
In-Reply-To: <49134D8E.1070407@redhat.com>
On Thu, Nov 06, 2008 at 03:03:26PM -0500, Steven Rostedt wrote:
> Alexey Dobriyan wrote:
>> On m68k-amiga:
>>
>> CC arch/m68k/kernel/asm-offsets.s
>> In file included from include/linux/fs.h:287,
>> from include/linux/ftrace.h:5, <===
>> from include/linux/hardirq.h:7,
>> from include2/asm/system.h:69,
>> from include/linux/list.h:7, <===
>> from include/linux/preempt.h:11,
>> from include/linux/spinlock.h:50,
>> from include/linux/seqlock.h:29,
>> from include/linux/time.h:8,
>> from include/linux/timex.h:57,
>> from include/linux/sched.h:54,
>> from arch/m68k/kernel/asm-offsets.c:12:
>> include/linux/wait.h:37: error: field 'task_list' has incomplete type
>> ...
>>
>> commit 7e5e26a3d8ac4bcadb380073dc9604c07a9a6198 aka "trace: fix hardirq header for non ftrace archs"
>>
>>
>>
> We only need to include the ftrace.h to declare the ftrace_nmi_enter and
> exit.
>
> I could separate that out into its own "ftrace_irq.h" file, that
> hardirq.h can include. That should fix it.
>
> basically all that would be needed in that file is this:
>
> #ifdef CONFIG_DYNAMIC_FTRACE
> extern void ftrace_nmi_enter(void);
> extern void ftrace_nmi_exit(void);
> #else
> static inline void ftrace_nmi_enter(void) { }
> static inline void ftrace_nmi_exit(void) { }
> #endif /* CONFIG_DYNAMIC_FTRACE */
Oh, this is only for that.
Here is patch that allows m68k to compile, I've came up with.
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -1,14 +1,12 @@
#ifndef _LINUX_FTRACE_H
#define _LINUX_FTRACE_H
+#include <linux/kallsyms.h>
+#ifdef CONFIG_FUNCTION_TRACER
#include <linux/linkage.h>
-#include <linux/fs.h>
#include <linux/ktime.h>
#include <linux/init.h>
#include <linux/types.h>
-#include <linux/kallsyms.h>
-
-#ifdef CONFIG_FUNCTION_TRACER
extern int ftrace_enabled;
extern int
@@ -236,7 +234,7 @@ static inline void
ftrace_init_module(unsigned long *start, unsigned long *end) { }
#endif
-
+#ifdef CONFIG_BOOT_TRACER
struct boot_trace {
pid_t caller;
char func[KSYM_NAME_LEN];
@@ -246,12 +244,10 @@ struct boot_trace {
ktime_t rettime;
};
-#ifdef CONFIG_BOOT_TRACER
extern void trace_boot(struct boot_trace *it, initcall_t fn);
extern void start_boot_trace(void);
extern void stop_boot_trace(void);
#else
-static inline void trace_boot(struct boot_trace *it, initcall_t fn) { }
static inline void start_boot_trace(void) { }
static inline void stop_boot_trace(void) { }
#endif
--- a/init/main.c
+++ b/init/main.c
@@ -728,6 +728,7 @@ core_param(initcall_debug, initcall_debug, bool, 0644);
int do_one_initcall(initcall_t fn)
{
+#ifdef CONFIG_BOOT_TRACER
int count = preempt_count();
ktime_t delta;
char msgbuf[64];
@@ -768,6 +769,9 @@ int do_one_initcall(initcall_t fn)
}
return it.result;
+#else
+ return fn();
+#endif
}
next prev parent reply other threads:[~2008-11-06 20:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-06 6:36 linux-next: Tree for November 6 Stephen Rothwell
2008-11-06 18:39 ` next-20081106: undefined reference to `__per_cpu_start' Alexey Dobriyan
2008-11-06 19:15 ` Christoph Lameter
2008-11-06 22:34 ` Alexey Dobriyan
2008-11-07 18:32 ` Christoph Lameter
2008-11-07 5:21 ` Stephen Rothwell
2008-11-07 5:44 ` Alexey Dobriyan
2008-11-07 18:28 ` Christoph Lameter
2008-11-07 18:40 ` Christoph Lameter
2008-11-18 4:33 ` linux-next: cpu_alloc tree patch (Was: Re: next-20081106: undefined reference to `__per_cpu_start') Stephen Rothwell
2008-11-19 19:18 ` Christoph Lameter
2008-11-12 7:59 ` next-20081106: undefined reference to `__per_cpu_start' Geert Uytterhoeven
2008-11-12 11:18 ` Mike Frysinger
2008-11-06 18:54 ` next-20081106: perfmon on ia64 Alexey Dobriyan
2008-11-06 20:44 ` stephane eranian
2008-11-06 19:44 ` next-20081106: today's ftrace episode Alexey Dobriyan
2008-11-06 20:03 ` Steven Rostedt
2008-11-06 20:15 ` Alexey Dobriyan [this message]
2008-11-06 20:28 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081106201559.GA17602@x200.localdomain \
--to=adobriyan@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=srostedt@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox