tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k: merge MMU and non-MMU versions of asm/hardirq.h
The contents of asm/hardirq.h are pretty strait forward for both the
MMU (hardirq_mm.h) and non-MMU (hardirq_no.h) include files. Merge the
two back into a single file.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
+32
-47
+32
-3
arch/m68k/include/asm/hardirq.h
+32
-3
arch/m68k/include/asm/hardirq.h
···
1
-
#ifdef __uClinux__
2
-
#include "hardirq_no.h"
1
+
#ifndef __M68K_HARDIRQ_H
2
+
#define __M68K_HARDIRQ_H
3
+
4
+
#include <linux/threads.h>
5
+
#include <linux/cache.h>
6
+
#include <asm/irq.h>
7
+
8
+
#define HARDIRQ_BITS 8
9
+
10
+
/*
11
+
* The hardirq mask has to be large enough to have
12
+
* space for potentially all IRQ sources in the system
13
+
* nesting on a single CPU:
14
+
*/
15
+
#if (1 << HARDIRQ_BITS) < NR_IRQS
16
+
# error HARDIRQ_BITS is too low!
17
+
#endif
18
+
19
+
#ifdef CONFIG_MMU
20
+
21
+
/* entry.S is sensitive to the offsets of these fields */
22
+
typedef struct {
23
+
unsigned int __softirq_pending;
24
+
} ____cacheline_aligned irq_cpustat_t;
25
+
26
+
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
27
+
3
28
#else
4
-
#include "hardirq_mm.h"
29
+
30
+
#include <asm-generic/hardirq.h>
31
+
32
+
#endif /* !CONFIG_MMU */
33
+
5
34
#endif
-16
arch/m68k/include/asm/hardirq_mm.h
-16
arch/m68k/include/asm/hardirq_mm.h
···
1
-
#ifndef __M68K_HARDIRQ_H
2
-
#define __M68K_HARDIRQ_H
3
-
4
-
#include <linux/threads.h>
5
-
#include <linux/cache.h>
6
-
7
-
/* entry.S is sensitive to the offsets of these fields */
8
-
typedef struct {
9
-
unsigned int __softirq_pending;
10
-
} ____cacheline_aligned irq_cpustat_t;
11
-
12
-
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
13
-
14
-
#define HARDIRQ_BITS 8
15
-
16
-
#endif
-19
arch/m68k/include/asm/hardirq_no.h
-19
arch/m68k/include/asm/hardirq_no.h
···
1
-
#ifndef __M68K_HARDIRQ_H
2
-
#define __M68K_HARDIRQ_H
3
-
4
-
#include <asm/irq.h>
5
-
6
-
#define HARDIRQ_BITS 8
7
-
8
-
/*
9
-
* The hardirq mask has to be large enough to have
10
-
* space for potentially all IRQ sources in the system
11
-
* nesting on a single CPU:
12
-
*/
13
-
#if (1 << HARDIRQ_BITS) < NR_IRQS
14
-
# error HARDIRQ_BITS is too low!
15
-
#endif
16
-
17
-
#include <asm-generic/hardirq.h>
18
-
19
-
#endif /* __M68K_HARDIRQ_H */
-9
arch/m68k/include/asm/irq.h
-9
arch/m68k/include/asm/irq.h
···
33
33
#include <linux/spinlock_types.h>
34
34
35
35
/*
36
-
* The hardirq mask has to be large enough to have
37
-
* space for potentially all IRQ sources in the system
38
-
* nesting on a single CPU:
39
-
*/
40
-
#if (1 << HARDIRQ_BITS) < NR_IRQS
41
-
# error HARDIRQ_BITS is too low!
42
-
#endif
43
-
44
-
/*
45
36
* Interrupt source definitions
46
37
* General interrupt sources are the level 1-7.
47
38
* Adding an interrupt service routine for one of these sources