lkml.org 
[lkml]   [2006]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] 2.6.17-rc5-mm1 compile-fix on ia64 for TRACE_IRQFLAGS
Date

The patches lock-validator-irqtrace-* intoduce a file
include/linux/trace_irqflags.h that includes asm/irqflags.h unconditionally.
Not all arches have this flag and ia64 is one of them so it fails to compile.
The following patch conditionally includes asm/irqflags if
CONFIG_TRACE_IRQFLAGS is set.


trace_irqflags.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
diff -rup -X /usr/src/patchset-0.6/bin//dontdiff linux-2.6.17-rc5-mm1-clean/include/linux/trace_irqflags.h linux-2.6.17-rc5-mm1-irqflags/include/linux/trace_irqflags.h
--- linux-2.6.17-rc5-mm1-clean/include/linux/trace_irqflags.h 2006-05-30 14:41:22.000000000 +0100
+++ linux-2.6.17-rc5-mm1-irqflags/include/linux/trace_irqflags.h 2006-05-30 16:00:23.000000000 +0100
@@ -11,13 +11,13 @@
#ifndef _LINUX_TRACE_IRQFLAGS_H
#define _LINUX_TRACE_IRQFLAGS_H

-#include <asm/irqflags.h>
-
/*
* The local_irq_*() APIs are equal to the raw_local_irq*()
* if !TRACE_IRQFLAGS.
*/
#ifdef CONFIG_TRACE_IRQFLAGS
+#include <asm/irqflags.h>
+
extern void trace_hardirqs_on(void);
extern void trace_hardirqs_off(void);
extern void trace_softirqs_on(unsigned long ip);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-05-30 19:19    [W:0.036 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site