[S390] convert bitmap definitions to C

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 8e9243ae0c19d13524a700c3ffea8aa4961665c8..334964a0fb143a5de9cd7d51c49053bdf64765e9 100644 (file)
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -57,7 +57,7 @@
  * with operation of the form "set_bit(bitnr, flags)".
  */
 
-/* bitmap tables from arch/S390/kernel/bitmap.S */
+/* bitmap tables from arch/s390/kernel/bitmap.c */
 extern const char _oi_bitmap[];
 extern const char _ni_bitmap[];
 extern const char _zb_findmap[];

diff --git a/arch/s390/kernel/bitmap.S b/arch/s390/kernel/bitmap.S
deleted file mode 100644 (file)
index dfb41f9..0000000
--- a/arch/s390/kernel/bitmap.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  arch/s390/kernel/bitmap.S
- *    Bitmaps for set_bit, clear_bit, test_and_set_bit, ...
- *    See include/asm-s390/{bitops.h|posix_types.h} for details
- *
- *  S390 version
- *    Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
- *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
- */
-
-         .globl _oi_bitmap
-_oi_bitmap:
-         .byte  0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
-
-         .globl _ni_bitmap
-_ni_bitmap:
-         .byte  0xFE,0xFD,0xFB,0xF7,0xEF,0xDF,0xBF,0x7F
-
-         .globl _zb_findmap
-_zb_findmap:
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4 
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4
-         .byte  0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,8
-
-         .globl _sb_findmap
-_sb_findmap:
-         .byte  8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-         .byte  4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0
-

diff --git a/arch/s390/kernel/bitmap.c b/arch/s390/kernel/bitmap.c
new file mode 100644 (file)
index 0000000..54e362b
--- /dev/null
+++ b/arch/s390/kernel/bitmap.c
@@ -0,0 +1,49 @@
+/*
+ *    Bitmaps for set_bit, clear_bit, test_and_set_bit, ...
+ *    See include/asm/{bitops.h|posix_types.h} for details
+ *
+ *    Copyright IBM Corp. 1999,2009
+ *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ */
+
+#include <linux/bitops.h>
+
+const char _oi_bitmap[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
+
+const char _ni_bitmap[] = { 0xfe, 0xfd, 0xfb, 0xf7, 0xef, 0xdf, 0xbf, 0x7f };
+
+const char _zb_findmap[] = {
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,7,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,6,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,5,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,
+       0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,8 };
+
+const char _sb_findmap[] = {
+       8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+       4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0 };