[PATCH] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

From: Philippe De Muyter
Date: Wed Oct 27 2010 - 05:34:18 EST


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@xxxxxxxxx>
---
arch/m68k/include/asm/irqflags.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

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>
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/