yann@402: From http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/att-1234/01-kmap-types-cleanup.patch
yann@402: See http://www.uwsg.iu.edu/hypermail/linux/kernel/0307.2/1234.html
yann@402: 
yann@402: From: Marc-Christian Petersen (m.c.p@wolk-project.de)
yann@402: 
yann@402: > > on alpha:
yann@402: > > internal.h:19:28: asm/kmap_types.h: No such file or directory
yann@402: > Same on s390 and some other platforms.We should just get rid of
yann@402: > this problem by providing a generic kmap_types header.
yann@402: I agree on this but your patch is bogus. Please use the attached one instead.
yann@402: 
yann@402: Marcello, please apply this one instead. Against 2.4.22-BK (2.4.21-bk14)
yann@402: 
yann@402: [ I commented out the hunk
yann@402: #+++ b/include/asm-mips/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: to get this to apply to linux-2.4.26. 
yann@402: - dank]
yann@402: 
yann@402: diff -Naurp a/crypto/internal.h b/crypto/internal.h
yann@402: --- a/crypto/internal.h	2003-07-19 14:09:06.000000000 +0200
yann@402: +++ b/crypto/internal.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -14,9 +14,9 @@
yann@402:  #include <linux/mm.h>
yann@402:  #include <linux/highmem.h>
yann@402:  #include <linux/init.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  #include <asm/hardirq.h>
yann@402:  #include <asm/softirq.h>
yann@402: -#include <asm/kmap_types.h>
yann@402:  
yann@402:  extern enum km_type crypto_km_types[];
yann@402:  
yann@402: diff -Naurp a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
yann@402: --- a/include/asm-i386/fixmap.h	2003-07-19 14:09:31.000000000 +0200
yann@402: +++ b/include/asm-i386/fixmap.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -20,7 +20,7 @@
yann@402:  #include <asm/page.h>
yann@402:  #ifdef CONFIG_HIGHMEM
yann@402:  #include <linux/threads.h>
yann@402: -#include <asm/kmap_types.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  #endif
yann@402:  
yann@402:  /*
yann@402: diff -Naurp a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
yann@402: --- a/include/asm-i386/highmem.h	2003-07-15 10:28:54.000000000 +0200
yann@402: +++ b/include/asm-i386/highmem.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -23,7 +23,6 @@
yann@402:  #include <linux/config.h>
yann@402:  #include <linux/init.h>
yann@402:  #include <linux/interrupt.h>
yann@402: -#include <asm/kmap_types.h>
yann@402:  #include <asm/pgtable.h>
yann@402:  
yann@402:  #ifdef CONFIG_DEBUG_HIGHMEM
yann@402: diff -Naurp a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
yann@402: --- a/include/asm-i386/kmap_types.h	2003-07-19 14:09:31.000000000 +0200
yann@402: +++ b/include/asm-i386/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,16 +0,0 @@
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BH_IRQ,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: diff -Naurp a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h
yann@402: --- a/include/asm-m68k/kmap_types.h	2003-07-19 14:09:33.000000000 +0200
yann@402: +++ b/include/asm-m68k/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,18 +0,0 @@
yann@402: -#ifdef __KERNEL__
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BH_IRQ,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: -#endif /* __KERNEL__ */
yann@402: diff -Naurp a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
yann@402: --- a/include/asm-mips/fixmap.h	2002-09-27 23:26:03.000000000 +0200
yann@402: +++ b/include/asm-mips/fixmap.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -18,7 +18,7 @@
yann@402:  #include <asm/page.h>
yann@402:  #ifdef CONFIG_HIGHMEM
yann@402:  #include <linux/threads.h>
yann@402: -#include <asm/kmap_types.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  #endif
yann@402:  
yann@402:  /*
yann@402: diff -Naurp a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
yann@402: --- a/include/asm-mips/highmem.h	2002-12-18 01:03:59.000000000 +0100
yann@402: +++ b/include/asm-mips/highmem.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -22,7 +22,6 @@
yann@402:  
yann@402:  #include <linux/init.h>
yann@402:  #include <linux/interrupt.h>
yann@402: -#include <asm/kmap_types.h>
yann@402:  #include <asm/pgtable.h>
yann@402:  
yann@402:  /* undef for production */
yann@402: #diff -Naurp a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h
yann@402: #--- a/include/asm-mips/kmap_types.h	2002-12-18 01:03:59.000000000 +0100
yann@402: #+++ b/include/asm-mips/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: #@@ -1,14 +0,0 @@
yann@402: #-#ifndef _ASM_KMAP_TYPES_H
yann@402: #-#define _ASM_KMAP_TYPES_H
yann@402: #-
yann@402: #-enum km_type {
yann@402: #-	KM_BOUNCE_READ,
yann@402: #-	KM_SKB_SUNRPC_DATA,
yann@402: #-	KM_SKB_DATA_SOFTIRQ,
yann@402: #-	KM_USER0,
yann@402: #-	KM_USER1,
yann@402: #-	KM_BIO_IRQ,
yann@402: #-	KM_TYPE_NR
yann@402: #-};
yann@402: #-
yann@402: #-#endif
yann@402: diff -Naurp a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
yann@402: --- a/include/asm-ppc/highmem.h	2003-07-19 14:09:33.000000000 +0200
yann@402: +++ b/include/asm-ppc/highmem.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -24,7 +24,7 @@
yann@402:  
yann@402:  #include <linux/init.h>
yann@402:  #include <linux/interrupt.h>
yann@402: -#include <asm/kmap_types.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  #include <asm/pgtable.h>
yann@402:  
yann@402:  /* undef for production */
yann@402: diff -Naurp a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
yann@402: --- a/include/asm-ppc/kmap_types.h	2003-07-19 14:09:33.000000000 +0200
yann@402: +++ b/include/asm-ppc/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,18 +0,0 @@
yann@402: -#ifdef __KERNEL__
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BH_IRQ,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: -#endif /* __KERNEL__ */
yann@402: diff -Naurp a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
yann@402: --- a/include/asm-ppc64/kmap_types.h	2003-07-19 14:09:35.000000000 +0200
yann@402: +++ b/include/asm-ppc64/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,23 +0,0 @@
yann@402: -#ifdef __KERNEL__
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BIO_SRC_IRQ,
yann@402: -	KM_BIO_DST_IRQ,
yann@402: -	KM_PTE0,
yann@402: -	KM_PTE1,
yann@402: -	KM_IRQ0,
yann@402: -	KM_IRQ1,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,	
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: -#endif /* __KERNEL__ */
yann@402: diff -Naurp a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
yann@402: --- a/include/asm-sparc/highmem.h	2003-07-15 10:28:56.000000000 +0200
yann@402: +++ b/include/asm-sparc/highmem.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -21,7 +21,7 @@
yann@402:  #ifdef __KERNEL__
yann@402:  
yann@402:  #include <linux/interrupt.h>
yann@402: -#include <asm/kmap_types.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  
yann@402:  /* undef for production */
yann@402:  #define HIGHMEM_DEBUG 1
yann@402: diff -Naurp a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
yann@402: --- a/include/asm-sparc/kmap_types.h	2003-07-19 14:09:37.000000000 +0200
yann@402: +++ b/include/asm-sparc/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,16 +0,0 @@
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BH_IRQ,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: diff -Naurp a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
yann@402: --- a/include/asm-sparc64/kmap_types.h	2003-07-19 14:09:37.000000000 +0200
yann@402: +++ b/include/asm-sparc64/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,20 +0,0 @@
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -/* Dummy header just to define km_type.  None of this
yann@402: - * is actually used on sparc64.  -DaveM
yann@402: - */
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_SUNRPC_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_BH_IRQ,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: diff -Naurp a/include/asm-x86_64/kmap_types.h b/include/asm-x86_64/kmap_types.h
yann@402: --- a/include/asm-x86_64/kmap_types.h	2003-07-19 14:09:37.000000000 +0200
yann@402: +++ b/include/asm-x86_64/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: @@ -1,15 +0,0 @@
yann@402: -#ifndef _ASM_KMAP_TYPES_H
yann@402: -#define _ASM_KMAP_TYPES_H
yann@402: -
yann@402: -enum km_type {
yann@402: -	KM_BOUNCE_READ,
yann@402: -	KM_SKB_DATA,
yann@402: -	KM_SKB_DATA_SOFTIRQ,
yann@402: -	KM_USER0,
yann@402: -	KM_USER1,
yann@402: -	KM_SOFTIRQ0,
yann@402: -	KM_SOFTIRQ1,
yann@402: -	KM_TYPE_NR
yann@402: -};
yann@402: -
yann@402: -#endif
yann@402: diff -Naurp a/include/linux/highmem.h b/include/linux/highmem.h
yann@402: --- a/include/linux/highmem.h	2003-07-19 14:09:37.000000000 +0200
yann@402: +++ b/include/linux/highmem.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -2,6 +2,7 @@
yann@402:  #define _LINUX_HIGHMEM_H
yann@402:  
yann@402:  #include <linux/config.h>
yann@402: +#include <linux/kmap_types.h>
yann@402:  #include <asm/pgalloc.h>
yann@402:  
yann@402:  #ifdef CONFIG_HIGHMEM
yann@402: diff -Naurp a/include/linux/kmap_types.h b/include/linux/kmap_types.h
yann@402: --- a/include/linux/kmap_types.h	1970-01-01 01:00:00.000000000 +0100
yann@402: +++ b/include/linux/kmap_types.h	2003-07-19 14:18:58.000000000 +0200
yann@402: @@ -0,0 +1,16 @@
yann@402: +#ifndef _LINUX_KMAP_TYPES_H
yann@402: +#define _LINUX_KMAP_TYPES_H
yann@402: +
yann@402: +enum km_type {
yann@402: +	KM_BOUNCE_READ,
yann@402: +	KM_SKB_SUNRPC_DATA,
yann@402: +	KM_SKB_DATA_SOFTIRQ,
yann@402: +	KM_USER0,
yann@402: +	KM_USER1,
yann@402: +	KM_BH_IRQ,
yann@402: +	KM_SOFTIRQ0,
yann@402: +	KM_SOFTIRQ1,
yann@402: +	KM_TYPE_NR
yann@402: +};
yann@402: +
yann@402: +#endif
yann@402: