diff options
Diffstat (limited to 'arch/m68k')
45 files changed, 89 insertions, 115 deletions
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index 61e5c54625ae..2559eefc6aff 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | 16 | ||
17 | #include <asm/system.h> | ||
18 | #include <asm/amigahw.h> | 17 | #include <asm/amigahw.h> |
19 | 18 | ||
20 | static unsigned short *snd_data; | 19 | static unsigned short *snd_data; |
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index b95a451b1c3a..ee01b7a38e58 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include <asm/bootinfo.h> | 30 | #include <asm/bootinfo.h> |
31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
32 | #include <asm/system.h> | ||
33 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
34 | #include <asm/amigahw.h> | 33 | #include <asm/amigahw.h> |
35 | #include <asm/amigaints.h> | 34 | #include <asm/amigaints.h> |
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 8d3eafab1ffe..0a30406b9442 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c | |||
@@ -9,7 +9,6 @@ | |||
9 | 9 | ||
10 | #include <asm/setup.h> | 10 | #include <asm/setup.h> |
11 | #include <asm/bootinfo.h> | 11 | #include <asm/bootinfo.h> |
12 | #include <asm/system.h> | ||
13 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
14 | #include <asm/apollohw.h> | 13 | #include <asm/apollohw.h> |
15 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index 8048e1b7e552..783d8f02360d 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <linux/seq_file.h> | 42 | #include <linux/seq_file.h> |
43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
44 | 44 | ||
45 | #include <asm/system.h> | ||
46 | #include <asm/traps.h> | 45 | #include <asm/traps.h> |
47 | 46 | ||
48 | #include <asm/atarihw.h> | 47 | #include <asm/atarihw.h> |
diff --git a/arch/m68k/atari/atasound.c b/arch/m68k/atari/atasound.c index d266fe89c125..1c1181ebb947 100644 --- a/arch/m68k/atari/atasound.c +++ b/arch/m68k/atari/atasound.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | 26 | ||
27 | #include <asm/atarihw.h> | 27 | #include <asm/atarihw.h> |
28 | #include <asm/system.h> | ||
29 | #include <asm/irq.h> | 28 | #include <asm/irq.h> |
30 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
31 | #include <asm/atariints.h> | 30 | #include <asm/atariints.h> |
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index c4ac15c4f065..d8eb32747ac5 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm/atarihw.h> | 39 | #include <asm/atarihw.h> |
40 | #include <asm/atariints.h> | 40 | #include <asm/atariints.h> |
41 | #include <asm/atari_stram.h> | 41 | #include <asm/atari_stram.h> |
42 | #include <asm/system.h> | ||
43 | #include <asm/machdep.h> | 42 | #include <asm/machdep.h> |
44 | #include <asm/hwtest.h> | 43 | #include <asm/hwtest.h> |
45 | #include <asm/io.h> | 44 | #include <asm/io.h> |
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 81286476f740..0bf850a20ea2 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/bcd.h> | 28 | #include <linux/bcd.h> |
29 | 29 | ||
30 | #include <asm/bootinfo.h> | 30 | #include <asm/bootinfo.h> |
31 | #include <asm/system.h> | ||
32 | #include <asm/pgtable.h> | 31 | #include <asm/pgtable.h> |
33 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
34 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c index 1c4d4c7bf4d4..cf12a17dc289 100644 --- a/arch/m68k/bvme6000/rtc.c +++ b/arch/m68k/bvme6000/rtc.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
24 | #include <asm/system.h> | ||
25 | #include <asm/setup.h> | 24 | #include <asm/setup.h> |
26 | 25 | ||
27 | /* | 26 | /* |
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c index c87fe69b0728..29a71be9fa5b 100644 --- a/arch/m68k/hp300/time.c +++ b/arch/m68k/hp300/time.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <asm/machdep.h> | 15 | #include <asm/machdep.h> |
16 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/system.h> | ||
19 | #include <asm/traps.h> | 18 | #include <asm/traps.h> |
20 | #include <asm/blinken.h> | 19 | #include <asm/blinken.h> |
21 | 20 | ||
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h index 4eba796c00d4..336e6173794f 100644 --- a/arch/m68k/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __ARCH_M68K_ATOMIC__ | 2 | #define __ARCH_M68K_ATOMIC__ |
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <asm/system.h> | 5 | #include <linux/irqflags.h> |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Atomic operations that C can't guarantee us. Useful for | 8 | * Atomic operations that C can't guarantee us. Useful for |
diff --git a/arch/m68k/include/asm/barrier.h b/arch/m68k/include/asm/barrier.h new file mode 100644 index 000000000000..445ce22c23cb --- /dev/null +++ b/arch/m68k/include/asm/barrier.h | |||
@@ -0,0 +1,20 @@ | |||
1 | #ifndef _M68K_BARRIER_H | ||
2 | #define _M68K_BARRIER_H | ||
3 | |||
4 | /* | ||
5 | * Force strict CPU ordering. | ||
6 | * Not really required on m68k... | ||
7 | */ | ||
8 | #define nop() do { asm volatile ("nop"); barrier(); } while (0) | ||
9 | #define mb() barrier() | ||
10 | #define rmb() barrier() | ||
11 | #define wmb() barrier() | ||
12 | #define read_barrier_depends() ((void)0) | ||
13 | #define set_mb(var, value) ({ (var) = (value); wmb(); }) | ||
14 | |||
15 | #define smp_mb() barrier() | ||
16 | #define smp_rmb() barrier() | ||
17 | #define smp_wmb() barrier() | ||
18 | #define smp_read_barrier_depends() ((void)0) | ||
19 | |||
20 | #endif /* _M68K_BARRIER_H */ | ||
diff --git a/arch/m68k/include/asm/system.h b/arch/m68k/include/asm/cmpxchg.h index 8dc68178716c..5c81d0eae5cf 100644 --- a/arch/m68k/include/asm/system.h +++ b/arch/m68k/include/asm/cmpxchg.h | |||
@@ -1,74 +1,13 @@ | |||
1 | #ifndef _M68K_SYSTEM_H | 1 | #ifndef __ARCH_M68K_CMPXCHG__ |
2 | #define _M68K_SYSTEM_H | 2 | #define __ARCH_M68K_CMPXCHG__ |
3 | 3 | ||
4 | #include <linux/linkage.h> | ||
5 | #include <linux/kernel.h> | ||
6 | #include <linux/bug.h> | ||
7 | #include <linux/irqflags.h> | 4 | #include <linux/irqflags.h> |
8 | #include <asm/segment.h> | ||
9 | #include <asm/entry.h> | ||
10 | |||
11 | #ifdef __KERNEL__ | ||
12 | |||
13 | /* | ||
14 | * switch_to(n) should switch tasks to task ptr, first checking that | ||
15 | * ptr isn't the current task, in which case it does nothing. This | ||
16 | * also clears the TS-flag if the task we switched to has used the | ||
17 | * math co-processor latest. | ||
18 | */ | ||
19 | /* | ||
20 | * switch_to() saves the extra registers, that are not saved | ||
21 | * automatically by SAVE_SWITCH_STACK in resume(), ie. d0-d5 and | ||
22 | * a0-a1. Some of these are used by schedule() and its predecessors | ||
23 | * and so we might get see unexpected behaviors when a task returns | ||
24 | * with unexpected register values. | ||
25 | * | ||
26 | * syscall stores these registers itself and none of them are used | ||
27 | * by syscall after the function in the syscall has been called. | ||
28 | * | ||
29 | * Beware that resume now expects *next to be in d1 and the offset of | ||
30 | * tss to be in a1. This saves a few instructions as we no longer have | ||
31 | * to push them onto the stack and read them back right after. | ||
32 | * | ||
33 | * 02/17/96 - Jes Sorensen (jds@kom.auc.dk) | ||
34 | * | ||
35 | * Changed 96/09/19 by Andreas Schwab | ||
36 | * pass prev in a0, next in a1 | ||
37 | */ | ||
38 | asmlinkage void resume(void); | ||
39 | #define switch_to(prev,next,last) do { \ | ||
40 | register void *_prev __asm__ ("a0") = (prev); \ | ||
41 | register void *_next __asm__ ("a1") = (next); \ | ||
42 | register void *_last __asm__ ("d1"); \ | ||
43 | __asm__ __volatile__("jbsr resume" \ | ||
44 | : "=a" (_prev), "=a" (_next), "=d" (_last) \ | ||
45 | : "0" (_prev), "1" (_next) \ | ||
46 | : "d0", "d2", "d3", "d4", "d5"); \ | ||
47 | (last) = _last; \ | ||
48 | } while (0) | ||
49 | |||
50 | |||
51 | /* | ||
52 | * Force strict CPU ordering. | ||
53 | * Not really required on m68k... | ||
54 | */ | ||
55 | #define nop() do { asm volatile ("nop"); barrier(); } while (0) | ||
56 | #define mb() barrier() | ||
57 | #define rmb() barrier() | ||
58 | #define wmb() barrier() | ||
59 | #define read_barrier_depends() ((void)0) | ||
60 | #define set_mb(var, value) ({ (var) = (value); wmb(); }) | ||
61 | |||
62 | #define smp_mb() barrier() | ||
63 | #define smp_rmb() barrier() | ||
64 | #define smp_wmb() barrier() | ||
65 | #define smp_read_barrier_depends() ((void)0) | ||
66 | |||
67 | #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) | ||
68 | 5 | ||
69 | struct __xchg_dummy { unsigned long a[100]; }; | 6 | struct __xchg_dummy { unsigned long a[100]; }; |
70 | #define __xg(x) ((volatile struct __xchg_dummy *)(x)) | 7 | #define __xg(x) ((volatile struct __xchg_dummy *)(x)) |
71 | 8 | ||
9 | extern unsigned long __invalid_xchg_size(unsigned long, volatile void *, int); | ||
10 | |||
72 | #ifndef CONFIG_RMW_INSNS | 11 | #ifndef CONFIG_RMW_INSNS |
73 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | 12 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) |
74 | { | 13 | { |
@@ -93,7 +32,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
93 | x = tmp; | 32 | x = tmp; |
94 | break; | 33 | break; |
95 | default: | 34 | default: |
96 | BUG(); | 35 | tmp = __invalid_xchg_size(x, ptr, size); |
36 | break; | ||
97 | } | 37 | } |
98 | 38 | ||
99 | local_irq_restore(flags); | 39 | local_irq_restore(flags); |
@@ -103,7 +43,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
103 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | 43 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) |
104 | { | 44 | { |
105 | switch (size) { | 45 | switch (size) { |
106 | case 1: | 46 | case 1: |
107 | __asm__ __volatile__ | 47 | __asm__ __volatile__ |
108 | ("moveb %2,%0\n\t" | 48 | ("moveb %2,%0\n\t" |
109 | "1:\n\t" | 49 | "1:\n\t" |
@@ -111,7 +51,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
111 | "jne 1b" | 51 | "jne 1b" |
112 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | 52 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); |
113 | break; | 53 | break; |
114 | case 2: | 54 | case 2: |
115 | __asm__ __volatile__ | 55 | __asm__ __volatile__ |
116 | ("movew %2,%0\n\t" | 56 | ("movew %2,%0\n\t" |
117 | "1:\n\t" | 57 | "1:\n\t" |
@@ -119,7 +59,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
119 | "jne 1b" | 59 | "jne 1b" |
120 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | 60 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); |
121 | break; | 61 | break; |
122 | case 4: | 62 | case 4: |
123 | __asm__ __volatile__ | 63 | __asm__ __volatile__ |
124 | ("movel %2,%0\n\t" | 64 | ("movel %2,%0\n\t" |
125 | "1:\n\t" | 65 | "1:\n\t" |
@@ -127,15 +67,23 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz | |||
127 | "jne 1b" | 67 | "jne 1b" |
128 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | 68 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); |
129 | break; | 69 | break; |
70 | default: | ||
71 | x = __invalid_xchg_size(x, ptr, size); | ||
72 | break; | ||
130 | } | 73 | } |
131 | return x; | 74 | return x; |
132 | } | 75 | } |
133 | #endif | 76 | #endif |
134 | 77 | ||
78 | #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) | ||
79 | |||
135 | #include <asm-generic/cmpxchg-local.h> | 80 | #include <asm-generic/cmpxchg-local.h> |
136 | 81 | ||
137 | #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) | 82 | #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) |
138 | 83 | ||
84 | extern unsigned long __invalid_cmpxchg_size(volatile void *, | ||
85 | unsigned long, unsigned long, int); | ||
86 | |||
139 | /* | 87 | /* |
140 | * Atomic compare and exchange. Compare OLD with MEM, if identical, | 88 | * Atomic compare and exchange. Compare OLD with MEM, if identical, |
141 | * store NEW in MEM. Return the initial value in MEM. Success is | 89 | * store NEW in MEM. Return the initial value in MEM. Success is |
@@ -163,6 +111,9 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, | |||
163 | : "=d" (old), "=m" (*(int *)p) | 111 | : "=d" (old), "=m" (*(int *)p) |
164 | : "d" (new), "0" (old), "m" (*(int *)p)); | 112 | : "d" (new), "0" (old), "m" (*(int *)p)); |
165 | break; | 113 | break; |
114 | default: | ||
115 | old = __invalid_cmpxchg_size(p, old, new, size); | ||
116 | break; | ||
166 | } | 117 | } |
167 | return old; | 118 | return old; |
168 | } | 119 | } |
@@ -187,8 +138,4 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, | |||
187 | 138 | ||
188 | #endif | 139 | #endif |
189 | 140 | ||
190 | #define arch_align_stack(x) (x) | 141 | #endif /* __ARCH_M68K_CMPXCHG__ */ |
191 | |||
192 | #endif /* __KERNEL__ */ | ||
193 | |||
194 | #endif /* _M68K_SYSTEM_H */ | ||
diff --git a/arch/m68k/include/asm/exec.h b/arch/m68k/include/asm/exec.h new file mode 100644 index 000000000000..0499adf90230 --- /dev/null +++ b/arch/m68k/include/asm/exec.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _M68K_EXEC_H | ||
2 | #define _M68K_EXEC_H | ||
3 | |||
4 | #define arch_align_stack(x) (x) | ||
5 | |||
6 | #endif /* _M68K_EXEC_H */ | ||
diff --git a/arch/m68k/include/asm/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h index 32c45f84ac60..95231e2f9d64 100644 --- a/arch/m68k/include/asm/sun3xflop.h +++ b/arch/m68k/include/asm/sun3xflop.h | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #include <asm/page.h> | 12 | #include <asm/page.h> |
13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
14 | #include <asm/system.h> | ||
15 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
16 | #include <asm/sun3x.h> | 15 | #include <asm/sun3x.h> |
17 | 16 | ||
diff --git a/arch/m68k/include/asm/switch_to.h b/arch/m68k/include/asm/switch_to.h new file mode 100644 index 000000000000..16fd6b634982 --- /dev/null +++ b/arch/m68k/include/asm/switch_to.h | |||
@@ -0,0 +1,41 @@ | |||
1 | #ifndef _M68K_SWITCH_TO_H | ||
2 | #define _M68K_SWITCH_TO_H | ||
3 | |||
4 | /* | ||
5 | * switch_to(n) should switch tasks to task ptr, first checking that | ||
6 | * ptr isn't the current task, in which case it does nothing. This | ||
7 | * also clears the TS-flag if the task we switched to has used the | ||
8 | * math co-processor latest. | ||
9 | */ | ||
10 | /* | ||
11 | * switch_to() saves the extra registers, that are not saved | ||
12 | * automatically by SAVE_SWITCH_STACK in resume(), ie. d0-d5 and | ||
13 | * a0-a1. Some of these are used by schedule() and its predecessors | ||
14 | * and so we might get see unexpected behaviors when a task returns | ||
15 | * with unexpected register values. | ||
16 | * | ||
17 | * syscall stores these registers itself and none of them are used | ||
18 | * by syscall after the function in the syscall has been called. | ||
19 | * | ||
20 | * Beware that resume now expects *next to be in d1 and the offset of | ||
21 | * tss to be in a1. This saves a few instructions as we no longer have | ||
22 | * to push them onto the stack and read them back right after. | ||
23 | * | ||
24 | * 02/17/96 - Jes Sorensen (jds@kom.auc.dk) | ||
25 | * | ||
26 | * Changed 96/09/19 by Andreas Schwab | ||
27 | * pass prev in a0, next in a1 | ||
28 | */ | ||
29 | asmlinkage void resume(void); | ||
30 | #define switch_to(prev,next,last) do { \ | ||
31 | register void *_prev __asm__ ("a0") = (prev); \ | ||
32 | register void *_next __asm__ ("a1") = (next); \ | ||
33 | register void *_last __asm__ ("d1"); \ | ||
34 | __asm__ __volatile__("jbsr resume" \ | ||
35 | : "=a" (_prev), "=a" (_next), "=d" (_last) \ | ||
36 | : "0" (_prev), "1" (_next) \ | ||
37 | : "d0", "d2", "d3", "d4", "d5"); \ | ||
38 | (last) = _last; \ | ||
39 | } while (0) | ||
40 | |||
41 | #endif /* _M68K_SWITCH_TO_H */ | ||
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 74fefac00899..6b32b64bac35 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | 16 | ||
17 | #include <asm/setup.h> | 17 | #include <asm/setup.h> |
18 | #include <asm/system.h> | ||
19 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
20 | #include <asm/traps.h> | 19 | #include <asm/traps.h> |
21 | #include <asm/page.h> | 20 | #include <asm/page.h> |
diff --git a/arch/m68k/kernel/irq.c b/arch/m68k/kernel/irq.c index c73988cfa90f..9ab4f550342e 100644 --- a/arch/m68k/kernel/irq.c +++ b/arch/m68k/kernel/irq.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
17 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
18 | #include <asm/system.h> | ||
19 | #include <asm/traps.h> | 18 | #include <asm/traps.h> |
20 | 19 | ||
21 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs) | 20 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs) |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index c54ef927e483..c488e3cfab53 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/mqueue.h> | 27 | #include <linux/mqueue.h> |
28 | 28 | ||
29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
30 | #include <asm/system.h> | ||
31 | #include <asm/traps.h> | 30 | #include <asm/traps.h> |
32 | #include <asm/machdep.h> | 31 | #include <asm/machdep.h> |
33 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index 149a05f8b9ee..8b4a2222e658 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
24 | #include <asm/page.h> | 24 | #include <asm/page.h> |
25 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
26 | #include <asm/system.h> | ||
27 | #include <asm/processor.h> | 26 | #include <asm/processor.h> |
28 | 27 | ||
29 | /* | 28 | /* |
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index daaa9187654c..388e5cc89599 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
34 | #include <asm/fpu.h> | 34 | #include <asm/fpu.h> |
35 | #include <asm/system.h> | ||
36 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
37 | #include <asm/traps.h> | 36 | #include <asm/traps.h> |
38 | #include <asm/pgalloc.h> | 37 | #include <asm/pgalloc.h> |
diff --git a/arch/m68k/kernel/vectors.c b/arch/m68k/kernel/vectors.c index 147b03fbc71e..322c977bb9ec 100644 --- a/arch/m68k/kernel/vectors.c +++ b/arch/m68k/kernel/vectors.c | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
27 | #include <asm/fpu.h> | 27 | #include <asm/fpu.h> |
28 | #include <asm/system.h> | ||
29 | #include <asm/traps.h> | 28 | #include <asm/traps.h> |
30 | 29 | ||
31 | /* assembler routines */ | 30 | /* assembler routines */ |
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index f60ff5f59205..96fa6ed7e799 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
31 | #include <asm/bootinfo.h> | 31 | #include <asm/bootinfo.h> |
32 | 32 | ||
33 | #include <asm/system.h> | ||
34 | #include <asm/io.h> | 33 | #include <asm/io.h> |
35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
36 | #include <asm/pgtable.h> | 35 | #include <asm/pgtable.h> |
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index eb915551de69..5e085554ac7f 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/rtc.h> | 21 | #include <asm/rtc.h> |
22 | #include <asm/system.h> | ||
23 | #include <asm/segment.h> | 22 | #include <asm/segment.h> |
24 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
25 | #include <asm/macintosh.h> | 24 | #include <asm/macintosh.h> |
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 2db6099784ba..6b020a8461e7 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | #include <asm/setup.h> | 14 | #include <asm/setup.h> |
15 | #include <asm/traps.h> | 15 | #include <asm/traps.h> |
16 | #include <asm/system.h> | ||
17 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
18 | #include <asm/pgalloc.h> | 17 | #include <asm/pgalloc.h> |
19 | 18 | ||
diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c index 89f3b203814b..f77f258dce3a 100644 --- a/arch/m68k/mm/init_mm.c +++ b/arch/m68k/mm/init_mm.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
24 | #include <asm/page.h> | 24 | #include <asm/page.h> |
25 | #include <asm/pgalloc.h> | 25 | #include <asm/pgalloc.h> |
26 | #include <asm/system.h> | ||
27 | #include <asm/traps.h> | 26 | #include <asm/traps.h> |
28 | #include <asm/machdep.h> | 27 | #include <asm/machdep.h> |
29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c index 1e33d39ca9a0..345ec0d83e3d 100644 --- a/arch/m68k/mm/init_no.c +++ b/arch/m68k/mm/init_no.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <asm/segment.h> | 36 | #include <asm/segment.h> |
37 | #include <asm/page.h> | 37 | #include <asm/page.h> |
38 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
39 | #include <asm/system.h> | ||
40 | #include <asm/machdep.h> | 39 | #include <asm/machdep.h> |
41 | 40 | ||
42 | /* | 41 | /* |
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c index 1cc2bed4c3dd..568cfad3ceb8 100644 --- a/arch/m68k/mm/kmap.c +++ b/arch/m68k/mm/kmap.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <asm/page.h> | 20 | #include <asm/page.h> |
21 | #include <asm/pgalloc.h> | 21 | #include <asm/pgalloc.h> |
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include <asm/system.h> | ||
24 | 23 | ||
25 | #undef DEBUG | 24 | #undef DEBUG |
26 | 25 | ||
diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index a5dbb74fe1de..250b8b786f4f 100644 --- a/arch/m68k/mm/memory.c +++ b/arch/m68k/mm/memory.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <asm/segment.h> | 17 | #include <asm/segment.h> |
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/pgalloc.h> | 19 | #include <asm/pgalloc.h> |
20 | #include <asm/system.h> | ||
21 | #include <asm/traps.h> | 20 | #include <asm/traps.h> |
22 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
23 | 22 | ||
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 8b3db1c587fc..0dafa693515b 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
25 | #include <asm/page.h> | 25 | #include <asm/page.h> |
26 | #include <asm/pgalloc.h> | 26 | #include <asm/pgalloc.h> |
27 | #include <asm/system.h> | ||
28 | #include <asm/machdep.h> | 27 | #include <asm/machdep.h> |
29 | #include <asm/io.h> | 28 | #include <asm/io.h> |
30 | #include <asm/dma.h> | 29 | #include <asm/dma.h> |
diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index 1b902dbd4376..e0804060501e 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <asm/uaccess.h> | 21 | #include <asm/uaccess.h> |
22 | #include <asm/page.h> | 22 | #include <asm/page.h> |
23 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
24 | #include <asm/system.h> | ||
25 | #include <asm/machdep.h> | 24 | #include <asm/machdep.h> |
26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
27 | 26 | ||
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index 5de924ef42ed..a41c09149e23 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
27 | 27 | ||
28 | #include <asm/bootinfo.h> | 28 | #include <asm/bootinfo.h> |
29 | #include <asm/system.h> | ||
30 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
31 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
32 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index c3fb3bdd7ed9..b6d7d8a7a3dd 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | 30 | ||
31 | #include <asm/bootinfo.h> | 31 | #include <asm/bootinfo.h> |
32 | #include <asm/system.h> | ||
33 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
34 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index 39c79ebcd18a..6ef7a81a3b12 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c | |||
@@ -20,7 +20,6 @@ | |||
20 | 20 | ||
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
23 | #include <asm/system.h> | ||
24 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
25 | 24 | ||
26 | /* | 25 | /* |
diff --git a/arch/m68k/platform/68328/config.c b/arch/m68k/platform/68328/config.c index 44b866544314..8c20e891e981 100644 --- a/arch/m68k/platform/68328/config.c +++ b/arch/m68k/platform/68328/config.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/rtc.h> | 20 | #include <linux/rtc.h> |
21 | #include <asm/system.h> | ||
22 | #include <asm/machdep.h> | 21 | #include <asm/machdep.h> |
23 | #include <asm/MC68328.h> | 22 | #include <asm/MC68328.h> |
24 | #if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD) | 23 | #if defined(CONFIG_PILOT) || defined(CONFIG_INIT_LCD) |
diff --git a/arch/m68k/platform/68328/timers.c b/arch/m68k/platform/68328/timers.c index b15ddef1ec76..c801c172b822 100644 --- a/arch/m68k/platform/68328/timers.c +++ b/arch/m68k/platform/68328/timers.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/clocksource.h> | 22 | #include <linux/clocksource.h> |
23 | #include <linux/rtc.h> | 23 | #include <linux/rtc.h> |
24 | #include <asm/setup.h> | 24 | #include <asm/setup.h> |
25 | #include <asm/system.h> | ||
26 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
27 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
28 | #include <asm/MC68VZ328.h> | 27 | #include <asm/MC68VZ328.h> |
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c index 599a5949f320..255fc03913e9 100644 --- a/arch/m68k/platform/68360/config.c +++ b/arch/m68k/platform/68360/config.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
19 | 19 | ||
20 | #include <asm/setup.h> | 20 | #include <asm/setup.h> |
21 | #include <asm/system.h> | ||
22 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
23 | #include <asm/machdep.h> | 22 | #include <asm/machdep.h> |
24 | #include <asm/m68360.h> | 23 | #include <asm/m68360.h> |
diff --git a/arch/m68k/platform/68EZ328/config.c b/arch/m68k/platform/68EZ328/config.c index dd2c53554341..4f158d551f02 100644 --- a/arch/m68k/platform/68EZ328/config.c +++ b/arch/m68k/platform/68EZ328/config.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
19 | #include <asm/system.h> | ||
20 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
21 | #include <asm/machdep.h> | 20 | #include <asm/machdep.h> |
22 | #include <asm/MC68EZ328.h> | 21 | #include <asm/MC68EZ328.h> |
diff --git a/arch/m68k/platform/68VZ328/config.c b/arch/m68k/platform/68VZ328/config.c index 25ec673edc25..2ed8dc305e42 100644 --- a/arch/m68k/platform/68VZ328/config.c +++ b/arch/m68k/platform/68VZ328/config.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
23 | #include <linux/rtc.h> | 23 | #include <linux/rtc.h> |
24 | 24 | ||
25 | #include <asm/system.h> | ||
26 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
27 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
28 | #include <asm/MC68VZ328.h> | 27 | #include <asm/MC68VZ328.h> |
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index be936480b964..512adb64f7dd 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/io.h> | 29 | #include <asm/io.h> |
30 | #include <asm/rtc.h> | 30 | #include <asm/rtc.h> |
31 | #include <asm/bootinfo.h> | 31 | #include <asm/bootinfo.h> |
32 | #include <asm/system.h> | ||
33 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
34 | #include <asm/setup.h> | 33 | #include <asm/setup.h> |
35 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c index 2b888491f29a..513f9bb17b9c 100644 --- a/arch/m68k/q40/q40ints.c +++ b/arch/m68k/q40/q40ints.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
19 | 19 | ||
20 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
21 | #include <asm/system.h> | ||
22 | #include <asm/traps.h> | 21 | #include <asm/traps.h> |
23 | 22 | ||
24 | #include <asm/q40_master.h> | 23 | #include <asm/q40_master.h> |
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c index 0116d208d300..94fe8016f1f0 100644 --- a/arch/m68k/sun3/intersil.c +++ b/arch/m68k/sun3/intersil.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/rtc.h> | 14 | #include <linux/rtc.h> |
15 | 15 | ||
16 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
17 | #include <asm/system.h> | ||
18 | #include <asm/rtc.h> | 17 | #include <asm/rtc.h> |
19 | #include <asm/intersil.h> | 18 | #include <asm/intersil.h> |
20 | 19 | ||
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index 94f81ecfe3f8..8edc510a21be 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
19 | #include <asm/traps.h> | 19 | #include <asm/traps.h> |
20 | #include <asm/system.h> | ||
21 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
22 | #include <asm/page.h> | 21 | #include <asm/page.h> |
23 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
diff --git a/arch/m68k/sun3/prom/console.c b/arch/m68k/sun3/prom/console.c index 2bcb6e4bfe54..e92364373b07 100644 --- a/arch/m68k/sun3/prom/console.c +++ b/arch/m68k/sun3/prom/console.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
11 | #include <asm/openprom.h> | 11 | #include <asm/openprom.h> |
12 | #include <asm/oplib.h> | 12 | #include <asm/oplib.h> |
13 | #include <asm/system.h> | ||
14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
15 | 14 | ||
16 | /* Non blocking get character from console input device, returns -1 | 15 | /* Non blocking get character from console input device, returns -1 |
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index fc599fad4a54..dd306c84d36d 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | 14 | ||
15 | #include <asm/system.h> | ||
16 | #include <asm/machdep.h> | 15 | #include <asm/machdep.h> |
17 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
18 | #include <asm/sun3xprom.h> | 17 | #include <asm/sun3xprom.h> |
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c index 536a04aaf22f..1d0a72480409 100644 --- a/arch/m68k/sun3x/time.c +++ b/arch/m68k/sun3x/time.c | |||
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/system.h> | ||
19 | #include <asm/traps.h> | 18 | #include <asm/traps.h> |
20 | #include <asm/sun3x.h> | 19 | #include <asm/sun3x.h> |
21 | #include <asm/sun3ints.h> | 20 | #include <asm/sun3ints.h> |