1.1 --- a/patches/linux/2.4.26/100-kmap-types-cleanup.patch Fri Sep 05 16:15:34 2008 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,306 +0,0 @@
1.4 -From http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/att-1234/01-kmap-types-cleanup.patch
1.5 -See http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/1234.html
1.6 -
1.7 -From: Marc-Christian Petersen (m.c.p@wolk-project.de)
1.8 -
1.9 -> > on alpha:
1.10 -> > internal.h:19:28: asm/kmap_types.h: No such file or directory
1.11 -> Same on s390 and some other platforms.We should just get rid of
1.12 -> this problem by providing a generic kmap_types header.
1.13 -I agree on this but your patch is bogus. Please use the attached one instead.
1.14 -
1.15 -Marcello, please apply this one instead. Against 2.4.22-BK (2.4.21-bk14)
1.16 -
1.17 -[ I commented out the hunk
1.18 -#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.19 -to get this to apply to linux-2.4.26.
1.20 -- dank]
1.21 -
1.22 -diff -Naurp a/crypto/internal.h b/crypto/internal.h
1.23 ---- a/crypto/internal.h 2003-07-19 14:09:06.000000000 +0200
1.24 -+++ b/crypto/internal.h 2003-07-19 14:18:58.000000000 +0200
1.25 -@@ -14,9 +14,9 @@
1.26 - #include <linux/mm.h>
1.27 - #include <linux/highmem.h>
1.28 - #include <linux/init.h>
1.29 -+#include <linux/kmap_types.h>
1.30 - #include <asm/hardirq.h>
1.31 - #include <asm/softirq.h>
1.32 --#include <asm/kmap_types.h>
1.33 -
1.34 - extern enum km_type crypto_km_types[];
1.35 -
1.36 -diff -Naurp a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
1.37 ---- a/include/asm-i386/fixmap.h 2003-07-19 14:09:31.000000000 +0200
1.38 -+++ b/include/asm-i386/fixmap.h 2003-07-19 14:18:58.000000000 +0200
1.39 -@@ -20,7 +20,7 @@
1.40 - #include <asm/page.h>
1.41 - #ifdef CONFIG_HIGHMEM
1.42 - #include <linux/threads.h>
1.43 --#include <asm/kmap_types.h>
1.44 -+#include <linux/kmap_types.h>
1.45 - #endif
1.46 -
1.47 - /*
1.48 -diff -Naurp a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
1.49 ---- a/include/asm-i386/highmem.h 2003-07-15 10:28:54.000000000 +0200
1.50 -+++ b/include/asm-i386/highmem.h 2003-07-19 14:18:58.000000000 +0200
1.51 -@@ -23,7 +23,6 @@
1.52 - #include <linux/config.h>
1.53 - #include <linux/init.h>
1.54 - #include <linux/interrupt.h>
1.55 --#include <asm/kmap_types.h>
1.56 - #include <asm/pgtable.h>
1.57 -
1.58 - #ifdef CONFIG_DEBUG_HIGHMEM
1.59 -diff -Naurp a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
1.60 ---- a/include/asm-i386/kmap_types.h 2003-07-19 14:09:31.000000000 +0200
1.61 -+++ b/include/asm-i386/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.62 -@@ -1,16 +0,0 @@
1.63 --#ifndef _ASM_KMAP_TYPES_H
1.64 --#define _ASM_KMAP_TYPES_H
1.65 --
1.66 --enum km_type {
1.67 -- KM_BOUNCE_READ,
1.68 -- KM_SKB_SUNRPC_DATA,
1.69 -- KM_SKB_DATA_SOFTIRQ,
1.70 -- KM_USER0,
1.71 -- KM_USER1,
1.72 -- KM_BH_IRQ,
1.73 -- KM_SOFTIRQ0,
1.74 -- KM_SOFTIRQ1,
1.75 -- KM_TYPE_NR
1.76 --};
1.77 --
1.78 --#endif
1.79 -diff -Naurp a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h
1.80 ---- a/include/asm-m68k/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
1.81 -+++ b/include/asm-m68k/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.82 -@@ -1,18 +0,0 @@
1.83 --#ifdef __KERNEL__
1.84 --#ifndef _ASM_KMAP_TYPES_H
1.85 --#define _ASM_KMAP_TYPES_H
1.86 --
1.87 --enum km_type {
1.88 -- KM_BOUNCE_READ,
1.89 -- KM_SKB_SUNRPC_DATA,
1.90 -- KM_SKB_DATA_SOFTIRQ,
1.91 -- KM_USER0,
1.92 -- KM_USER1,
1.93 -- KM_BH_IRQ,
1.94 -- KM_SOFTIRQ0,
1.95 -- KM_SOFTIRQ1,
1.96 -- KM_TYPE_NR
1.97 --};
1.98 --
1.99 --#endif
1.100 --#endif /* __KERNEL__ */
1.101 -diff -Naurp a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
1.102 ---- a/include/asm-mips/fixmap.h 2002-09-27 23:26:03.000000000 +0200
1.103 -+++ b/include/asm-mips/fixmap.h 2003-07-19 14:18:58.000000000 +0200
1.104 -@@ -18,7 +18,7 @@
1.105 - #include <asm/page.h>
1.106 - #ifdef CONFIG_HIGHMEM
1.107 - #include <linux/threads.h>
1.108 --#include <asm/kmap_types.h>
1.109 -+#include <linux/kmap_types.h>
1.110 - #endif
1.111 -
1.112 - /*
1.113 -diff -Naurp a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
1.114 ---- a/include/asm-mips/highmem.h 2002-12-18 01:03:59.000000000 +0100
1.115 -+++ b/include/asm-mips/highmem.h 2003-07-19 14:18:58.000000000 +0200
1.116 -@@ -22,7 +22,6 @@
1.117 -
1.118 - #include <linux/init.h>
1.119 - #include <linux/interrupt.h>
1.120 --#include <asm/kmap_types.h>
1.121 - #include <asm/pgtable.h>
1.122 -
1.123 - /* undef for production */
1.124 -#diff -Naurp a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h
1.125 -#--- a/include/asm-mips/kmap_types.h 2002-12-18 01:03:59.000000000 +0100
1.126 -#+++ b/include/asm-mips/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.127 -#@@ -1,14 +0,0 @@
1.128 -#-#ifndef _ASM_KMAP_TYPES_H
1.129 -#-#define _ASM_KMAP_TYPES_H
1.130 -#-
1.131 -#-enum km_type {
1.132 -#- KM_BOUNCE_READ,
1.133 -#- KM_SKB_SUNRPC_DATA,
1.134 -#- KM_SKB_DATA_SOFTIRQ,
1.135 -#- KM_USER0,
1.136 -#- KM_USER1,
1.137 -#- KM_BIO_IRQ,
1.138 -#- KM_TYPE_NR
1.139 -#-};
1.140 -#-
1.141 -#-#endif
1.142 -diff -Naurp a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
1.143 ---- a/include/asm-ppc/highmem.h 2003-07-19 14:09:33.000000000 +0200
1.144 -+++ b/include/asm-ppc/highmem.h 2003-07-19 14:18:58.000000000 +0200
1.145 -@@ -24,7 +24,7 @@
1.146 -
1.147 - #include <linux/init.h>
1.148 - #include <linux/interrupt.h>
1.149 --#include <asm/kmap_types.h>
1.150 -+#include <linux/kmap_types.h>
1.151 - #include <asm/pgtable.h>
1.152 -
1.153 - /* undef for production */
1.154 -diff -Naurp a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
1.155 ---- a/include/asm-ppc/kmap_types.h 2003-07-19 14:09:33.000000000 +0200
1.156 -+++ b/include/asm-ppc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.157 -@@ -1,18 +0,0 @@
1.158 --#ifdef __KERNEL__
1.159 --#ifndef _ASM_KMAP_TYPES_H
1.160 --#define _ASM_KMAP_TYPES_H
1.161 --
1.162 --enum km_type {
1.163 -- KM_BOUNCE_READ,
1.164 -- KM_SKB_SUNRPC_DATA,
1.165 -- KM_SKB_DATA_SOFTIRQ,
1.166 -- KM_USER0,
1.167 -- KM_USER1,
1.168 -- KM_BH_IRQ,
1.169 -- KM_SOFTIRQ0,
1.170 -- KM_SOFTIRQ1,
1.171 -- KM_TYPE_NR
1.172 --};
1.173 --
1.174 --#endif
1.175 --#endif /* __KERNEL__ */
1.176 -diff -Naurp a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
1.177 ---- a/include/asm-ppc64/kmap_types.h 2003-07-19 14:09:35.000000000 +0200
1.178 -+++ b/include/asm-ppc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.179 -@@ -1,23 +0,0 @@
1.180 --#ifdef __KERNEL__
1.181 --#ifndef _ASM_KMAP_TYPES_H
1.182 --#define _ASM_KMAP_TYPES_H
1.183 --
1.184 --enum km_type {
1.185 -- KM_BOUNCE_READ,
1.186 -- KM_SKB_SUNRPC_DATA,
1.187 -- KM_SKB_DATA_SOFTIRQ,
1.188 -- KM_USER0,
1.189 -- KM_USER1,
1.190 -- KM_BIO_SRC_IRQ,
1.191 -- KM_BIO_DST_IRQ,
1.192 -- KM_PTE0,
1.193 -- KM_PTE1,
1.194 -- KM_IRQ0,
1.195 -- KM_IRQ1,
1.196 -- KM_SOFTIRQ0,
1.197 -- KM_SOFTIRQ1,
1.198 -- KM_TYPE_NR
1.199 --};
1.200 --
1.201 --#endif
1.202 --#endif /* __KERNEL__ */
1.203 -diff -Naurp a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
1.204 ---- a/include/asm-sparc/highmem.h 2003-07-15 10:28:56.000000000 +0200
1.205 -+++ b/include/asm-sparc/highmem.h 2003-07-19 14:18:58.000000000 +0200
1.206 -@@ -21,7 +21,7 @@
1.207 - #ifdef __KERNEL__
1.208 -
1.209 - #include <linux/interrupt.h>
1.210 --#include <asm/kmap_types.h>
1.211 -+#include <linux/kmap_types.h>
1.212 -
1.213 - /* undef for production */
1.214 - #define HIGHMEM_DEBUG 1
1.215 -diff -Naurp a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
1.216 ---- a/include/asm-sparc/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
1.217 -+++ b/include/asm-sparc/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.218 -@@ -1,16 +0,0 @@
1.219 --#ifndef _ASM_KMAP_TYPES_H
1.220 --#define _ASM_KMAP_TYPES_H
1.221 --
1.222 --enum km_type {
1.223 -- KM_BOUNCE_READ,
1.224 -- KM_SKB_SUNRPC_DATA,
1.225 -- KM_SKB_DATA_SOFTIRQ,
1.226 -- KM_USER0,
1.227 -- KM_USER1,
1.228 -- KM_BH_IRQ,
1.229 -- KM_SOFTIRQ0,
1.230 -- KM_SOFTIRQ1,
1.231 -- KM_TYPE_NR
1.232 --};
1.233 --
1.234 --#endif
1.235 -diff -Naurp a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
1.236 ---- a/include/asm-sparc64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
1.237 -+++ b/include/asm-sparc64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.238 -@@ -1,20 +0,0 @@
1.239 --#ifndef _ASM_KMAP_TYPES_H
1.240 --#define _ASM_KMAP_TYPES_H
1.241 --
1.242 --/* Dummy header just to define km_type. None of this
1.243 -- * is actually used on sparc64. -DaveM
1.244 -- */
1.245 --
1.246 --enum km_type {
1.247 -- KM_BOUNCE_READ,
1.248 -- KM_SKB_SUNRPC_DATA,
1.249 -- KM_SKB_DATA_SOFTIRQ,
1.250 -- KM_USER0,
1.251 -- KM_USER1,
1.252 -- KM_BH_IRQ,
1.253 -- KM_SOFTIRQ0,
1.254 -- KM_SOFTIRQ1,
1.255 -- KM_TYPE_NR
1.256 --};
1.257 --
1.258 --#endif
1.259 -diff -Naurp a/include/asm-x86_64/kmap_types.h b/include/asm-x86_64/kmap_types.h
1.260 ---- a/include/asm-x86_64/kmap_types.h 2003-07-19 14:09:37.000000000 +0200
1.261 -+++ b/include/asm-x86_64/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.262 -@@ -1,15 +0,0 @@
1.263 --#ifndef _ASM_KMAP_TYPES_H
1.264 --#define _ASM_KMAP_TYPES_H
1.265 --
1.266 --enum km_type {
1.267 -- KM_BOUNCE_READ,
1.268 -- KM_SKB_DATA,
1.269 -- KM_SKB_DATA_SOFTIRQ,
1.270 -- KM_USER0,
1.271 -- KM_USER1,
1.272 -- KM_SOFTIRQ0,
1.273 -- KM_SOFTIRQ1,
1.274 -- KM_TYPE_NR
1.275 --};
1.276 --
1.277 --#endif
1.278 -diff -Naurp a/include/linux/highmem.h b/include/linux/highmem.h
1.279 ---- a/include/linux/highmem.h 2003-07-19 14:09:37.000000000 +0200
1.280 -+++ b/include/linux/highmem.h 2003-07-19 14:18:58.000000000 +0200
1.281 -@@ -2,6 +2,7 @@
1.282 - #define _LINUX_HIGHMEM_H
1.283 -
1.284 - #include <linux/config.h>
1.285 -+#include <linux/kmap_types.h>
1.286 - #include <asm/pgalloc.h>
1.287 -
1.288 - #ifdef CONFIG_HIGHMEM
1.289 -diff -Naurp a/include/linux/kmap_types.h b/include/linux/kmap_types.h
1.290 ---- a/include/linux/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
1.291 -+++ b/include/linux/kmap_types.h 2003-07-19 14:18:58.000000000 +0200
1.292 -@@ -0,0 +1,16 @@
1.293 -+#ifndef _LINUX_KMAP_TYPES_H
1.294 -+#define _LINUX_KMAP_TYPES_H
1.295 -+
1.296 -+enum km_type {
1.297 -+ KM_BOUNCE_READ,
1.298 -+ KM_SKB_SUNRPC_DATA,
1.299 -+ KM_SKB_DATA_SOFTIRQ,
1.300 -+ KM_USER0,
1.301 -+ KM_USER1,
1.302 -+ KM_BH_IRQ,
1.303 -+ KM_SOFTIRQ0,
1.304 -+ KM_SOFTIRQ1,
1.305 -+ KM_TYPE_NR
1.306 -+};
1.307 -+
1.308 -+#endif
1.309 -