Skip to contentSkip to conversation

Linux 2.4.22-pre7

DISCUSSION Arnd Bergmann 2 participants 2 messages Jul 19, 2003 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

Arnd Bergmann

author
#2 lore raw
Quoted 3 lines · Tom Vier

on alpha:

internal.h:19:28: asm/kmap_types.h: No such file or directory

Same on s390 and some other platforms.We should just get rid of this problem by providing a generic kmap_types header.

Marcello, please consider this patch.

        Arnd <><
Signature · 69 lines
D: Add generic <asm/kmap_types.h> for all architectures that are missing it.
D: This is needed to build the crypto drivers.

diff -Nru a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-generic/kmap_types.h  Sat Jul 19 13:33:30 2003
@@ -0,0 +1,22 @@
+#ifndef _ASM_KMAP_TYPES_H
+#define _ASM_KMAP_TYPES_H
+
+/* This header defines a generic km_type that can be
+ * used by all architectures that do not support
+ * high memory.
+ */
+
+enum km_type {
+       KM_BOUNCE_READ,
+       KM_SKB_SUNRPC_DATA,
+       KM_SKB_DATA_SOFTIRQ,
+       KM_USER0,
+       KM_USER1,
+       KM_BH_IRQ,
+       KM_SOFTIRQ0,
+       KM_SOFTIRQ1,
+
+       KM_TYPE_NR
+};
+
+#endif
diff -Nru a/include/asm-alpha/kmap_types.h b/include/asm-alpha/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-alpha/kmap_types.h    Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-arm/kmap_types.h b/include/asm-arm/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-arm/kmap_types.h      Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-cris/kmap_types.h b/include/asm-cris/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-cris/kmap_types.h     Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-ia64/kmap_types.h b/include/asm-ia64/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-ia64/kmap_types.h     Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-s390/kmap_types.h b/include/asm-s390/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-s390/kmap_types.h     Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-s390x/kmap_types.h b/include/asm-s390x/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-s390x/kmap_types.h    Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-sh/kmap_types.h b/include/asm-sh/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-sh/kmap_types.h       Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
diff -Nru a/include/asm-sh64/kmap_types.h b/include/asm-sh64/kmap_types.h
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/include/asm-sh64/kmap_types.h     Sat Jul 19 13:33:30 2003
@@ -0,0 +1 @@
+#include <asm-generic/kmap_types.h>
#3 lore raw

On Saturday 19 July 2003 13:41, Arnd Bergmann wrote:

Hi Arnd,

Quoted 4 lines
Quoted 2 lines

on alpha:
internal.h:19:28: asm/kmap_types.h: No such file or directory

Same on s390 and some other platforms.We should just get rid of this problem by providing a generic kmap_types header.

I agree on this but your patch is bogus. Please use the attached one instead.

Marcello, please apply this one instead. Against 2.4.22-BK (2.4.21-bk14)

ciao, Marc

crypto/internal.h +1 -1
diff -Naurp a/crypto/internal.h b/crypto/internal.h
@@ -14,9 +14,9 @@
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/init.h>
+#include <linux/kmap_types.h>
 #include <asm/hardirq.h>
 #include <asm/softirq.h>
-#include <asm/kmap_types.h>
 
 extern enum km_type crypto_km_types[];
include/asm-i386/fixmap.h +1 -1
diff -Naurp a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
@@ -20,7 +20,7 @@
 #include <asm/page.h>
 #ifdef CONFIG_HIGHMEM
 #include <linux/threads.h>
-#include <asm/kmap_types.h>
+#include <linux/kmap_types.h>
 #endif
 
 /*
include/asm-i386/highmem.h +0 -1
diff -Naurp a/include/asm-i386/highmem.h b/include/asm-i386/highmem.h
@@ -23,7 +23,6 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/kmap_types.h>
 #include <asm/pgtable.h>
 
 #ifdef CONFIG_DEBUG_HIGHMEM
include/asm-i386/kmap_types.h +0 -16
diff -Naurp a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
@@ -1,16 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BH_IRQ,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
include/asm-m68k/kmap_types.h +0 -18
diff -Naurp a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h
@@ -1,18 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BH_IRQ,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
include/asm-mips/fixmap.h +1 -1
diff -Naurp a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h
@@ -18,7 +18,7 @@
 #include <asm/page.h>
 #ifdef CONFIG_HIGHMEM
 #include <linux/threads.h>
-#include <asm/kmap_types.h>
+#include <linux/kmap_types.h>
 #endif
 
 /*
include/asm-mips/highmem.h +0 -1
diff -Naurp a/include/asm-mips/highmem.h b/include/asm-mips/highmem.h
@@ -22,7 +22,6 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/kmap_types.h>
 #include <asm/pgtable.h>
 
 /* undef for production */
include/asm-mips/kmap_types.h +0 -14
diff -Naurp a/include/asm-mips/kmap_types.h b/include/asm-mips/kmap_types.h
@@ -1,14 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BIO_IRQ,
-	KM_TYPE_NR
-};
-
-#endif
include/asm-ppc/highmem.h +1 -1
diff -Naurp a/include/asm-ppc/highmem.h b/include/asm-ppc/highmem.h
@@ -24,7 +24,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <asm/kmap_types.h>
+#include <linux/kmap_types.h>
 #include <asm/pgtable.h>
 
 /* undef for production */
include/asm-ppc/kmap_types.h +0 -18
diff -Naurp a/include/asm-ppc/kmap_types.h b/include/asm-ppc/kmap_types.h
@@ -1,18 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BH_IRQ,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
include/asm-ppc64/kmap_types.h +0 -23
diff -Naurp a/include/asm-ppc64/kmap_types.h b/include/asm-ppc64/kmap_types.h
@@ -1,23 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BIO_SRC_IRQ,
-	KM_BIO_DST_IRQ,
-	KM_PTE0,
-	KM_PTE1,
-	KM_IRQ0,
-	KM_IRQ1,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,	
-	KM_TYPE_NR
-};
-
-#endif
-#endif /* __KERNEL__ */
include/asm-sparc/highmem.h +1 -1
diff -Naurp a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
@@ -21,7 +21,7 @@
 #ifdef __KERNEL__
 
 #include <linux/interrupt.h>
-#include <asm/kmap_types.h>
+#include <linux/kmap_types.h>
 
 /* undef for production */
 #define HIGHMEM_DEBUG 1
include/asm-sparc/kmap_types.h +0 -16
diff -Naurp a/include/asm-sparc/kmap_types.h b/include/asm-sparc/kmap_types.h
@@ -1,16 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BH_IRQ,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
include/asm-sparc64/kmap_types.h +0 -20
diff -Naurp a/include/asm-sparc64/kmap_types.h b/include/asm-sparc64/kmap_types.h
@@ -1,20 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-/* Dummy header just to define km_type.  None of this
- * is actually used on sparc64.  -DaveM
- */
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_SUNRPC_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_BH_IRQ,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
include/asm-x86_64/kmap_types.h +0 -15
diff -Naurp a/include/asm-x86_64/kmap_types.h b/include/asm-x86_64/kmap_types.h
@@ -1,15 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-enum km_type {
-	KM_BOUNCE_READ,
-	KM_SKB_DATA,
-	KM_SKB_DATA_SOFTIRQ,
-	KM_USER0,
-	KM_USER1,
-	KM_SOFTIRQ0,
-	KM_SOFTIRQ1,
-	KM_TYPE_NR
-};
-
-#endif
include/linux/highmem.h +1 -0
diff -Naurp a/include/linux/highmem.h b/include/linux/highmem.h
@@ -2,6 +2,7 @@
 #define _LINUX_HIGHMEM_H
 
 #include <linux/config.h>
+#include <linux/kmap_types.h>
 #include <asm/pgalloc.h>
 
 #ifdef CONFIG_HIGHMEM
include/linux/kmap_types.h +16 -0
diff -Naurp a/include/linux/kmap_types.h b/include/linux/kmap_types.h
@@ -0,0 +1,16 @@
+#ifndef _LINUX_KMAP_TYPES_H
+#define _LINUX_KMAP_TYPES_H
+
+enum km_type {
+	KM_BOUNCE_READ,
+	KM_SKB_SUNRPC_DATA,
+	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
+	KM_BH_IRQ,
+	KM_SOFTIRQ0,
+	KM_SOFTIRQ1,
+	KM_TYPE_NR
+};
+
+#endif