From: Greg Ungerer <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org
Cc: dhowells@redhat.com, gerg@uclinux.org, phdm@macqel.be
Subject: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
Date: Sat, 30 Oct 2010 00:06:32 +1000 [thread overview]
Message-ID: <4CCAD4E8.8040801@snapgear.com> (raw)
(Note: this bounced back to me from the m68k-linux list,
not sure why... resending)
Hi David, m68kers,
Philippe DeMuyter noticed this build failure with Linus' current git
tree. I think it is m68k clean too. If all are ok with it I'll
pass it directly to Linus.
Regards
Greg
---------------------------------------------------------------------
m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
Recent changes to header files made kernel compilation for m68k/m68knommu
fail with :
CC arch/m68knommu/kernel/asm-offsets.s
In file included from /archives/linux/git/arch/m68k/include/asm/system.h:2,
from include/linux/wait.h:25,
from include/linux/mmzone.h:9,
from include/linux/gfp.h:4,
from include/linux/irq.h:20,
from include/asm-generic/hardirq.h:12,
from
/archives/linux/git/arch/m68k/include/asm/hardirq_no.h:17,
from
/archives/linux/git/arch/m68k/include/asm/hardirq.h:2,
from include/linux/hardirq.h:10,
from
/archives/linux/git/arch/m68k/include/asm/irqflags.h:5,
from include/linux/irqflags.h:15,
from include/linux/spinlock.h:53,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/timex.h:56,
from include/linux/sched.h:56,
from arch/m68knommu/kernel/asm-offsets.c:12:
/archives/linux/git/arch/m68k/include/asm/system_no.h: In
function â__xchgâ:
/archives/linux/git/arch/m68k/include/asm/system_no.h:79: error:
implicit declaration of function âlocal_irq_saveâ
/archives/linux/git/arch/m68k/include/asm/system_no.h:101: error:
implicit declaration of function âlocal_irq_restoreâ
Fix that
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
---
diff --git a/arch/m68k/include/asm/irqflags.h
b/arch/m68k/include/asm/irqflags.h
index 4a5b284..38b414d 100644
--- a/arch/m68k/include/asm/irqflags.h
+++ b/arch/m68k/include/asm/irqflags.h
@@ -2,7 +2,6 @@
#define _M68K_IRQFLAGS_H
#include <linux/types.h>
-#include <linux/hardirq.h>
#include <linux/preempt.h>
#include <asm/thread_info.h>
#include <asm/entry.h>
next reply other threads:[~2010-10-29 14:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 14:06 Greg Ungerer [this message]
2010-10-29 16:31 ` [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h Geert Uytterhoeven
2010-10-29 21:57 ` Greg Ungerer
2010-10-30 5:08 ` Philippe De Muyter
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=4CCAD4E8.8040801@snapgear.com \
--to=gerg@snapgear.com \
--cc=dhowells@redhat.com \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
--cc=phdm@macqel.be \
/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