revert "m68k: convert to asm-generic/hardirq.h"
Revert 45d80eea87
("m68k: convert to
asm-generic/hardirq.h") - it fails to compile due to an inclusion tangle:
In file included from include/linux/irq.h:12,
from include/asm-generic/hardirq.h:6,
from /usr/src/devel/arch/m68k/include/asm/hardirq_mm.h:6,
from /usr/src/devel/arch/m68k/include/asm/hardirq.h:4,
from include/linux/hardirq.h:10,
from /usr/src/devel/arch/m68k/include/asm/system_mm.h:69,
from /usr/src/devel/arch/m68k/include/asm/system.h:4,
from include/linux/list.h:7,
from include/linux/preempt.h:11,
from include/linux/spinlock.h:50,
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/m68k/kernel/asm-offsets.c:14:
include/linux/smp.h:17: error: field 'list' has incomplete type
Cc: Christoph Hellwig <hch@lst.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b3db4a8ad1
commit
a28b3dc909
|
@ -1,8 +1,16 @@
|
||||||
#ifndef __M68K_HARDIRQ_H
|
#ifndef __M68K_HARDIRQ_H
|
||||||
#define __M68K_HARDIRQ_H
|
#define __M68K_HARDIRQ_H
|
||||||
|
|
||||||
|
#include <linux/threads.h>
|
||||||
|
#include <linux/cache.h>
|
||||||
|
|
||||||
|
/* entry.S is sensitive to the offsets of these fields */
|
||||||
|
typedef struct {
|
||||||
|
unsigned int __softirq_pending;
|
||||||
|
} ____cacheline_aligned irq_cpustat_t;
|
||||||
|
|
||||||
|
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
|
||||||
|
|
||||||
#define HARDIRQ_BITS 8
|
#define HARDIRQ_BITS 8
|
||||||
|
|
||||||
#include <asm-generic/hardirq.h>
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue