|
yann@1
|
1 |
From http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/att-1234/01-kmap-types-cleanup.patch
|
|
yann@1
|
2 |
See http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/1234.html
|
|
yann@1
|
3 |
|
|
yann@1
|
4 |
From: Marc-Christian Petersen (m.c.p@wolk-project.de)
|
|
yann@1
|
5 |
|
|
yann@1
|
6 |
> > on alpha:
|
|
yann@1
|
7 |
> > internal.h:19:28: asm/kmap_types.h: No such file or directory
|
|
yann@1
|
8 |
> Same on s390 and some other platforms.We should just get rid of
|
|
yann@1
|
9 |
> this problem by providing a generic kmap_types header.
|
|
yann@1
|
10 |
I agree on this but your patch is bogus. Please use the attached one instead.
|
|
yann@1
|
11 |
|
|
yann@1
|
12 |
Marcello, please apply this one instead. Against 2.4.22-BK (2.4.21-bk14)
|
|
yann@1
|
13 |
|
|
yann@1
|
14 |
[ I commented out the hunk
|
|
yann@1
|
15 |
#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
16 |
to get this to apply to linux-2.4.26.
|
|
yann@1
|
17 |
- dank]
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
diff -Naurp a/crypto/internal.h b/crypto/internal.h
|
|
yann@1
|
20 |
--- a/crypto/internal.h 2003-07-19 14:09:06.000000000 +0200
|
|
yann@1
|
21 |
+++ b/crypto/internal.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
22 |
@@ -14,9 +14,9 @@
|
|
yann@1
|
23 |
#include <linux/mm.h>
|
|
yann@1
|
24 |
#include <linux/highmem.h>
|
|
yann@1
|
25 |
#include <linux/init.h>
|
|
yann@1
|
26 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
27 |
#include <asm/hardirq.h>
|
|
yann@1
|
28 |
#include <asm/softirq.h>
|
|
yann@1
|
29 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
30 |
|
|
yann@1
|
31 |
extern enum km_type crypto_km_types[];
|
|
yann@1
|
32 |
|
|
yann@1
|
33 |
diff -Naurp a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
|
|
yann@1
|
34 |
--- a/include/asm-i386/fixmap.h 2003-07-19 14:09:31.000000000 +0200
|
|
yann@1
|
35 |
+++ b/include/asm-i386/fixmap.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
36 |
@@ -20,7 +20,7 @@
|
|
yann@1
|
37 |
#include <asm/page.h>
|
|
yann@1
|
38 |
#ifdef CONFIG_HIGHMEM
|
|
yann@1
|
39 |
#include <linux/threads.h>
|
|
yann@1
|
40 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
41 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
42 |
#endif
|
|
yann@1
|
43 |
|
|
yann@1
|
44 |
/*
|
|
yann@1
|
45 |
diff -Naurp a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
|
|
yann@1
|
46 |
--- a/include/asm-i386/highmem.h 2003-07-15 10:28:54.000000000 +0200
|
|
yann@1
|
47 |
+++ b/include/asm-i386/highmem.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
48 |
@@ -23,7 +23,6 @@
|
|
yann@1
|
49 |
#include <linux/config.h>
|
|
yann@1
|
50 |
#include <linux/init.h>
|
|
yann@1
|
51 |
#include <linux/interrupt.h>
|
|
yann@1
|
52 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
53 |
#include <asm/pgtable.h>
|
|
yann@1
|
54 |
|
|
yann@1
|
55 |
#ifdef CONFIG_DEBUG_HIGHMEM
|
|
yann@1
|
56 |
diff -Naurp a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
|
|
yann@1
|
57 |
--- a/include/asm-i386/kmap_types.h 2003-07-19 14:09:31.000000000 +0200
|
|
yann@1
|
58 |
+++ b/include/asm-i386/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
59 |
@@ -1,16 +0,0 @@
|
|
yann@1
|
60 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
61 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
62 |
-
|
|
yann@1
|
63 |
-enum km_type {
|
|
yann@1
|
64 |
- KM_BOUNCE_READ,
|
|
yann@1
|
65 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
66 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
67 |
- KM_USER0,
|
|
yann@1
|
68 |
- KM_USER1,
|
|
yann@1
|
69 |
- KM_BH_IRQ,
|
|
yann@1
|
70 |
- KM_SOFTIRQ0,
|
|
yann@1
|
71 |
- KM_SOFTIRQ1,
|
|
yann@1
|
72 |
- KM_TYPE_NR
|
|
yann@1
|
73 |
-};
|
|
yann@1
|
74 |
-
|
|
yann@1
|
75 |
-#endif
|
|
yann@1
|
76 |
diff -Naurp a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h
|
|
yann@1
|
77 |
--- a/include/asm-m68k/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
|
|
yann@1
|
78 |
+++ b/include/asm-m68k/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
79 |
@@ -1,18 +0,0 @@
|
|
yann@1
|
80 |
-#ifdef __KERNEL__
|
|
yann@1
|
81 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
82 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
83 |
-
|
|
yann@1
|
84 |
-enum km_type {
|
|
yann@1
|
85 |
- KM_BOUNCE_READ,
|
|
yann@1
|
86 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
87 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
88 |
- KM_USER0,
|
|
yann@1
|
89 |
- KM_USER1,
|
|
yann@1
|
90 |
- KM_BH_IRQ,
|
|
yann@1
|
91 |
- KM_SOFTIRQ0,
|
|
yann@1
|
92 |
- KM_SOFTIRQ1,
|
|
yann@1
|
93 |
- KM_TYPE_NR
|
|
yann@1
|
94 |
-};
|
|
yann@1
|
95 |
-
|
|
yann@1
|
96 |
-#endif
|
|
yann@1
|
97 |
-#endif /* __KERNEL__ */
|
|
yann@1
|
98 |
diff -Naurp a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
|
|
yann@1
|
99 |
--- a/include/asm-mips/fixmap.h 2002-09-27 23:26:03.000000000 +0200
|
|
yann@1
|
100 |
+++ b/include/asm-mips/fixmap.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
101 |
@@ -18,7 +18,7 @@
|
|
yann@1
|
102 |
#include <asm/page.h>
|
|
yann@1
|
103 |
#ifdef CONFIG_HIGHMEM
|
|
yann@1
|
104 |
#include <linux/threads.h>
|
|
yann@1
|
105 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
106 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
107 |
#endif
|
|
yann@1
|
108 |
|
|
yann@1
|
109 |
/*
|
|
yann@1
|
110 |
diff -Naurp a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
|
|
yann@1
|
111 |
--- a/include/asm-mips/highmem.h 2002-12-18 01:03:59.000000000 +0100
|
|
yann@1
|
112 |
+++ b/include/asm-mips/highmem.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
113 |
@@ -22,7 +22,6 @@
|
|
yann@1
|
114 |
|
|
yann@1
|
115 |
#include <linux/init.h>
|
|
yann@1
|
116 |
#include <linux/interrupt.h>
|
|
yann@1
|
117 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
118 |
#include <asm/pgtable.h>
|
|
yann@1
|
119 |
|
|
yann@1
|
120 |
/* undef for production */
|
|
yann@1
|
121 |
#diff -Naurp a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h
|
|
yann@1
|
122 |
#--- a/include/asm-mips/kmap_types.h 2002-12-18 01:03:59.000000000 +0100
|
|
yann@1
|
123 |
#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
124 |
#@@ -1,14 +0,0 @@
|
|
yann@1
|
125 |
#-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
126 |
#-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
127 |
#-
|
|
yann@1
|
128 |
#-enum km_type {
|
|
yann@1
|
129 |
#- KM_BOUNCE_READ,
|
|
yann@1
|
130 |
#- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
131 |
#- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
132 |
#- KM_USER0,
|
|
yann@1
|
133 |
#- KM_USER1,
|
|
yann@1
|
134 |
#- KM_BIO_IRQ,
|
|
yann@1
|
135 |
#- KM_TYPE_NR
|
|
yann@1
|
136 |
#-};
|
|
yann@1
|
137 |
#-
|
|
yann@1
|
138 |
#-#endif
|
|
yann@1
|
139 |
diff -Naurp a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
|
|
yann@1
|
140 |
--- a/include/asm-ppc/highmem.h 2003-07-19 14:09:33.000000000 +0200
|
|
yann@1
|
141 |
+++ b/include/asm-ppc/highmem.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
142 |
@@ -24,7 +24,7 @@
|
|
yann@1
|
143 |
|
|
yann@1
|
144 |
#include <linux/init.h>
|
|
yann@1
|
145 |
#include <linux/interrupt.h>
|
|
yann@1
|
146 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
147 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
148 |
#include <asm/pgtable.h>
|
|
yann@1
|
149 |
|
|
yann@1
|
150 |
/* undef for production */
|
|
yann@1
|
151 |
diff -Naurp a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
|
|
yann@1
|
152 |
--- a/include/asm-ppc/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
|
|
yann@1
|
153 |
+++ b/include/asm-ppc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
154 |
@@ -1,18 +0,0 @@
|
|
yann@1
|
155 |
-#ifdef __KERNEL__
|
|
yann@1
|
156 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
157 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
158 |
-
|
|
yann@1
|
159 |
-enum km_type {
|
|
yann@1
|
160 |
- KM_BOUNCE_READ,
|
|
yann@1
|
161 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
162 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
163 |
- KM_USER0,
|
|
yann@1
|
164 |
- KM_USER1,
|
|
yann@1
|
165 |
- KM_BH_IRQ,
|
|
yann@1
|
166 |
- KM_SOFTIRQ0,
|
|
yann@1
|
167 |
- KM_SOFTIRQ1,
|
|
yann@1
|
168 |
- KM_TYPE_NR
|
|
yann@1
|
169 |
-};
|
|
yann@1
|
170 |
-
|
|
yann@1
|
171 |
-#endif
|
|
yann@1
|
172 |
-#endif /* __KERNEL__ */
|
|
yann@1
|
173 |
diff -Naurp a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
|
|
yann@1
|
174 |
--- a/include/asm-ppc64/kmap_types.h 2003-07-19 14:09:35.000000000 +0200
|
|
yann@1
|
175 |
+++ b/include/asm-ppc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
176 |
@@ -1,23 +0,0 @@
|
|
yann@1
|
177 |
-#ifdef __KERNEL__
|
|
yann@1
|
178 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
179 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
180 |
-
|
|
yann@1
|
181 |
-enum km_type {
|
|
yann@1
|
182 |
- KM_BOUNCE_READ,
|
|
yann@1
|
183 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
184 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
185 |
- KM_USER0,
|
|
yann@1
|
186 |
- KM_USER1,
|
|
yann@1
|
187 |
- KM_BIO_SRC_IRQ,
|
|
yann@1
|
188 |
- KM_BIO_DST_IRQ,
|
|
yann@1
|
189 |
- KM_PTE0,
|
|
yann@1
|
190 |
- KM_PTE1,
|
|
yann@1
|
191 |
- KM_IRQ0,
|
|
yann@1
|
192 |
- KM_IRQ1,
|
|
yann@1
|
193 |
- KM_SOFTIRQ0,
|
|
yann@1
|
194 |
- KM_SOFTIRQ1,
|
|
yann@1
|
195 |
- KM_TYPE_NR
|
|
yann@1
|
196 |
-};
|
|
yann@1
|
197 |
-
|
|
yann@1
|
198 |
-#endif
|
|
yann@1
|
199 |
-#endif /* __KERNEL__ */
|
|
yann@1
|
200 |
diff -Naurp a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
|
|
yann@1
|
201 |
--- a/include/asm-sparc/highmem.h 2003-07-15 10:28:56.000000000 +0200
|
|
yann@1
|
202 |
+++ b/include/asm-sparc/highmem.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
203 |
@@ -21,7 +21,7 @@
|
|
yann@1
|
204 |
#ifdef __KERNEL__
|
|
yann@1
|
205 |
|
|
yann@1
|
206 |
#include <linux/interrupt.h>
|
|
yann@1
|
207 |
-#include <asm/kmap_types.h>
|
|
yann@1
|
208 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
209 |
|
|
yann@1
|
210 |
/* undef for production */
|
|
yann@1
|
211 |
#define HIGHMEM_DEBUG 1
|
|
yann@1
|
212 |
diff -Naurp a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
|
|
yann@1
|
213 |
--- a/include/asm-sparc/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
|
|
yann@1
|
214 |
+++ b/include/asm-sparc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
215 |
@@ -1,16 +0,0 @@
|
|
yann@1
|
216 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
217 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
218 |
-
|
|
yann@1
|
219 |
-enum km_type {
|
|
yann@1
|
220 |
- KM_BOUNCE_READ,
|
|
yann@1
|
221 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
222 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
223 |
- KM_USER0,
|
|
yann@1
|
224 |
- KM_USER1,
|
|
yann@1
|
225 |
- KM_BH_IRQ,
|
|
yann@1
|
226 |
- KM_SOFTIRQ0,
|
|
yann@1
|
227 |
- KM_SOFTIRQ1,
|
|
yann@1
|
228 |
- KM_TYPE_NR
|
|
yann@1
|
229 |
-};
|
|
yann@1
|
230 |
-
|
|
yann@1
|
231 |
-#endif
|
|
yann@1
|
232 |
diff -Naurp a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
|
|
yann@1
|
233 |
--- a/include/asm-sparc64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
|
|
yann@1
|
234 |
+++ b/include/asm-sparc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
235 |
@@ -1,20 +0,0 @@
|
|
yann@1
|
236 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
237 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
238 |
-
|
|
yann@1
|
239 |
-/* Dummy header just to define km_type. None of this
|
|
yann@1
|
240 |
- * is actually used on sparc64. -DaveM
|
|
yann@1
|
241 |
- */
|
|
yann@1
|
242 |
-
|
|
yann@1
|
243 |
-enum km_type {
|
|
yann@1
|
244 |
- KM_BOUNCE_READ,
|
|
yann@1
|
245 |
- KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
246 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
247 |
- KM_USER0,
|
|
yann@1
|
248 |
- KM_USER1,
|
|
yann@1
|
249 |
- KM_BH_IRQ,
|
|
yann@1
|
250 |
- KM_SOFTIRQ0,
|
|
yann@1
|
251 |
- KM_SOFTIRQ1,
|
|
yann@1
|
252 |
- KM_TYPE_NR
|
|
yann@1
|
253 |
-};
|
|
yann@1
|
254 |
-
|
|
yann@1
|
255 |
-#endif
|
|
yann@1
|
256 |
diff -Naurp a/include/asm-x86_64/kmap_types.h b/include/asm-x86_64/kmap_types.h
|
|
yann@1
|
257 |
--- a/include/asm-x86_64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
|
|
yann@1
|
258 |
+++ b/include/asm-x86_64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
259 |
@@ -1,15 +0,0 @@
|
|
yann@1
|
260 |
-#ifndef _ASM_KMAP_TYPES_H
|
|
yann@1
|
261 |
-#define _ASM_KMAP_TYPES_H
|
|
yann@1
|
262 |
-
|
|
yann@1
|
263 |
-enum km_type {
|
|
yann@1
|
264 |
- KM_BOUNCE_READ,
|
|
yann@1
|
265 |
- KM_SKB_DATA,
|
|
yann@1
|
266 |
- KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
267 |
- KM_USER0,
|
|
yann@1
|
268 |
- KM_USER1,
|
|
yann@1
|
269 |
- KM_SOFTIRQ0,
|
|
yann@1
|
270 |
- KM_SOFTIRQ1,
|
|
yann@1
|
271 |
- KM_TYPE_NR
|
|
yann@1
|
272 |
-};
|
|
yann@1
|
273 |
-
|
|
yann@1
|
274 |
-#endif
|
|
yann@1
|
275 |
diff -Naurp a/include/linux/highmem.h b/include/linux/highmem.h
|
|
yann@1
|
276 |
--- a/include/linux/highmem.h 2003-07-19 14:09:37.000000000 +0200
|
|
yann@1
|
277 |
+++ b/include/linux/highmem.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
278 |
@@ -2,6 +2,7 @@
|
|
yann@1
|
279 |
#define _LINUX_HIGHMEM_H
|
|
yann@1
|
280 |
|
|
yann@1
|
281 |
#include <linux/config.h>
|
|
yann@1
|
282 |
+#include <linux/kmap_types.h>
|
|
yann@1
|
283 |
#include <asm/pgalloc.h>
|
|
yann@1
|
284 |
|
|
yann@1
|
285 |
#ifdef CONFIG_HIGHMEM
|
|
yann@1
|
286 |
diff -Naurp a/include/linux/kmap_types.h b/include/linux/kmap_types.h
|
|
yann@1
|
287 |
--- a/include/linux/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
|
|
yann@1
|
288 |
+++ b/include/linux/kmap_types.h 2003-07-19 14:18:58.000000000 +0200
|
|
yann@1
|
289 |
@@ -0,0 +1,16 @@
|
|
yann@1
|
290 |
+#ifndef _LINUX_KMAP_TYPES_H
|
|
yann@1
|
291 |
+#define _LINUX_KMAP_TYPES_H
|
|
yann@1
|
292 |
+
|
|
yann@1
|
293 |
+enum km_type {
|
|
yann@1
|
294 |
+ KM_BOUNCE_READ,
|
|
yann@1
|
295 |
+ KM_SKB_SUNRPC_DATA,
|
|
yann@1
|
296 |
+ KM_SKB_DATA_SOFTIRQ,
|
|
yann@1
|
297 |
+ KM_USER0,
|
|
yann@1
|
298 |
+ KM_USER1,
|
|
yann@1
|
299 |
+ KM_BH_IRQ,
|
|
yann@1
|
300 |
+ KM_SOFTIRQ0,
|
|
yann@1
|
301 |
+ KM_SOFTIRQ1,
|
|
yann@1
|
302 |
+ KM_TYPE_NR
|
|
yann@1
|
303 |
+};
|
|
yann@1
|
304 |
+
|
|
yann@1
|
305 |
+#endif
|
|
yann@1
|
306 |
|