public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mel Gorman <mel@csn.ul.ie>
To: akpm@osdl.org
Cc: Mel Gorman <mel@csn.ul.ie>,
	mingo@elte.hu, arjan@linux.intel.com,
	linux-kernel@vger.kernel.org, tglx@linutronix.de
Subject: [PATCH 1/2] 2.6.17-rc5-mm1 compile-fix on ia64 for TRACE_IRQFLAGS
Date: Tue, 30 May 2006 18:17:02 +0100 (IST)	[thread overview]
Message-ID: <20060530171702.27305.73485.sendpatchset@skynet> (raw)
In-Reply-To: <20060530171642.27305.38862.sendpatchset@skynet>


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);

  reply	other threads:[~2006-05-30 17:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-30 17:16 [PATCH 0/2] Compile problems on ia64 with 2.6.17-rc5-mm1 Mel Gorman
2006-05-30 17:17 ` Mel Gorman [this message]
2006-05-30 17:17 ` [PATCH 2/2] 2.6.17-rc5-mm1 compile-fix on ia64 for desc->handler Mel Gorman

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=20060530171702.27305.73485.sendpatchset@skynet \
    --to=mel@csn.ul.ie \
    --cc=akpm@osdl.org \
    --cc=arjan@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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