LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 0/1] ftrace: fix hardirq.h for m68k
@ 2008-11-06 21:19 Steven Rostedt
  2008-11-06 21:19 ` [PATCH 1/1] ftrace: split out hardirq ftrace code into own header Steven Rostedt
  0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2008-11-06 21:19 UTC (permalink / raw)
  To: linux-kernel; +Cc: Ingo Molnar, Alexey Dobriyan, Stephen Rothwell, linux-next

[
  Lets try this again. This time in the patch directory.
]


Ingo and Stephen,

The problem that Alexey pointed out should be fixed by this trivial patch.

The following patches are in:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git

    branch: tip/devel


Steven Rostedt (1):
      ftrace: split out hardirq ftrace code into own header


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/1] ftrace: split out hardirq ftrace code into own header
  2008-11-06 21:19 [PATCH 0/1] ftrace: fix hardirq.h for m68k Steven Rostedt
@ 2008-11-06 21:19 ` Steven Rostedt
  2008-11-06 22:36   ` Alexey Dobriyan
  0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2008-11-06 21:19 UTC (permalink / raw)
  To: linux-kernel
  Cc: Ingo Molnar, Alexey Dobriyan, Stephen Rothwell, linux-next,
	Steven Rostedt

[-- Attachment #1: 0001-ftrace-split-out-hardirq-ftrace-code-into-own-heade.patch --]
[-- Type: text/plain, Size: 2346 bytes --]

Impact: moving of function prototypes into own header file

ftrace.h is too big of a file for hardirq.h, and some archs will fail
to build because of the include dependencies not being met.

This patch pulls out the required prototypes for hardirq.h into a smaller
and safer ftrace_irq.h file.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 include/linux/ftrace.h     |    5 -----
 include/linux/ftrace_irq.h |   13 +++++++++++++
 include/linux/hardirq.h    |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 include/linux/ftrace_irq.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 41054a3..1f5608c 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -134,9 +134,6 @@ extern void ftrace_release(void *start, unsigned long size);
 
 extern void ftrace_disable_daemon(void);
 extern void ftrace_enable_daemon(void);
-extern void ftrace_nmi_enter(void);
-extern void ftrace_nmi_exit(void);
-
 #else
 # define skip_trace(ip)				({ 0; })
 # define ftrace_force_update()			({ 0; })
@@ -144,8 +141,6 @@ extern void ftrace_nmi_exit(void);
 # define ftrace_disable_daemon()		do { } while (0)
 # define ftrace_enable_daemon()			do { } while (0)
 static inline void ftrace_release(void *start, unsigned long size) { }
-static inline void ftrace_nmi_enter(void) { }
-static inline void ftrace_nmi_exit(void) { }
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 /* totally disable ftrace - can not re-enable after this */
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h
new file mode 100644
index 0000000..b1299d6
--- /dev/null
+++ b/include/linux/ftrace_irq.h
@@ -0,0 +1,13 @@
+#ifndef _LINUX_FTRACE_IRQ_H
+#define _LINUX_FTRACE_IRQ_H
+
+
+#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
+
+#endif /* _LINUX_FTRACE_IRQ_H */
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index ffc16ab..89a56d7 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -4,7 +4,7 @@
 #include <linux/preempt.h>
 #include <linux/smp_lock.h>
 #include <linux/lockdep.h>
-#include <linux/ftrace.h>
+#include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>
 #include <asm/system.h>
 
-- 
1.5.6.5

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] ftrace: split out hardirq ftrace code into own header
  2008-11-06 21:19 ` [PATCH 1/1] ftrace: split out hardirq ftrace code into own header Steven Rostedt
@ 2008-11-06 22:36   ` Alexey Dobriyan
  0 siblings, 0 replies; 3+ messages in thread
From: Alexey Dobriyan @ 2008-11-06 22:36 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: linux-kernel, Ingo Molnar, Stephen Rothwell, linux-next, Steven Rostedt

On Thu, Nov 06, 2008 at 04:19:50PM -0500, Steven Rostedt wrote:
> -#include <linux/ftrace.h>
> +#include <linux/ftrace_irq.h>

This helps, please don't forget in merge compile fixes into original patches
before pleasepulling.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-11-06 22:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-06 21:19 [PATCH 0/1] ftrace: fix hardirq.h for m68k Steven Rostedt
2008-11-06 21:19 ` [PATCH 1/1] ftrace: split out hardirq ftrace code into own header Steven Rostedt
2008-11-06 22:36   ` Alexey Dobriyan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).