x86: merge some trivially mergeable headers

Merge errno.h, resource.h, rtc.h, sections.h, serial.h and sockios.h, where i386 and x86_64 have no or only trivial comment/include guard differences. Build tested on both 32-bit and 64-bit, and booted on 64-bit. [tglx: fixup Kbuild as well] Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
author: Roland Dreier <roland@digitalvampire.org> 2007-10-15 07:57:46 -0400
committer: Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> 2007-10-17 14:17:09 -0400
commit: 217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch)
tree: 1f3ba24177455aeadcf065b9157ccac9252c7cfc
parent: 020bd9f1c766ca743556461a70a5b5d559b7e60c (diff)
7 files changed, 40 insertions, 102 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 0618ca386ab1..158deea39a54 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -59,8 +59,6 @@ unifdef-y += siginfo_32.h
 unifdef-y += siginfo_64.h
 unifdef-y += signal_32.h
 unifdef-y += signal_64.h
-unifdef-y += sockios_32.h
-unifdef-y += sockios_64.h
 unifdef-y += stat_32.h
 unifdef-y += stat_64.h
 unifdef-y += statfs_32.h
diff --git a/include/asm-x86/serial.h b/include/asm-x86/serial.h
index cf1b05227b29..628c801535ea 100644
--- a/include/asm-x86/serial.h
+++ b/include/asm-x86/serial.h
@@ -1,5 +1,29 @@
-#ifdef CONFIG_X86_32
+#ifndef _ASM_X86_SERIAL_H
-# include "serial_32.h"
+#define _ASM_X86_SERIAL_H
+/*
+ * This assumes you have a 1.8432 MHz clock for your UART.
+ *
+ * It'd be nice if someone built a serial card with a 24.576 MHz
+ * clock, since the 16550A is capable of handling a top speed of 1.5
+ * megabits/second; but this requires the faster clock.
+ */
+#define BASE_BAUD ( 1843200 / 16 )
+/* Standard COM flags (except for COM4, because of the 8514 problem) */
+#ifdef CONFIG_SERIAL_DETECT_IRQ
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
 #else
-# include "serial_64.h"
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
 #endif
+#define SERIAL_PORT_DFNS                        \
+        /* UART CLK   PORT IRQ     FLAGS        */                      \
+        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
+        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },      /* ttyS1 */     \
+        { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },      /* ttyS2 */     \
+        { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },     /* ttyS3 */
+#endif /* _ASM_X86_SERIAL_H */
diff --git a/include/asm-x86/serial_32.h b/include/asm-x86/serial_32.h
deleted file mode 100644
index bd67480ca109..000000000000
--- a/include/asm-x86/serial_32.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/asm-i386/serial.h
- */
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD ( 1843200 / 16 )
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
-#endif
-#define SERIAL_PORT_DFNS                        \
-        /* UART CLK   PORT IRQ     FLAGS        */                      \
-        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
-        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },      /* ttyS1 */     \
-        { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },      /* ttyS2 */     \
-        { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },     /* ttyS3 */
diff --git a/include/asm-x86/serial_64.h b/include/asm-x86/serial_64.h
deleted file mode 100644
index b0496e0d72a6..000000000000
--- a/include/asm-x86/serial_64.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/asm-x86_64/serial.h
- */
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
- *
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
- */
-#define BASE_BAUD ( 1843200 / 16 )
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
-#endif
-#define SERIAL_PORT_DFNS                        \
-        /* UART CLK   PORT IRQ     FLAGS        */                      \
-        { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },      /* ttyS0 */     \
-        { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },      /* ttyS1 */     \
-        { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },      /* ttyS2 */     \
-        { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },     /* ttyS3 */
diff --git a/include/asm-x86/sockios.h b/include/asm-x86/sockios.h
index 5a134fc70b9c..49cc72b5d3c9 100644
--- a/include/asm-x86/sockios.h
+++ b/include/asm-x86/sockios.h
@@ -1,13 +1,13 @@
-#ifdef __KERNEL__
+#ifndef _ASM_X86_SOCKIOS_H
-# ifdef CONFIG_X86_32
+#define _ASM_X86_SOCKIOS_H
-#  include "sockios_32.h"
-# else
+/* Socket-level I/O control calls. */
-#  include "sockios_64.h"
+#define FIOSETOWN       0x8901
-# endif
+#define SIOCSPGRP       0x8902
-#else
+#define FIOGETOWN       0x8903
-# ifdef __i386__
+#define SIOCGPGRP       0x8904
-#  include "sockios_32.h"
+#define SIOCATMARK      0x8905
-# else
+#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#  include "sockios_64.h"
+#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-# endif
-#endif
+#endif /* _ASM_X86_SOCKIOS_H */
diff --git a/include/asm-x86/sockios_32.h b/include/asm-x86/sockios_32.h
deleted file mode 100644
index ff528c7d255c..000000000000
--- a/include/asm-x86/sockios_32.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_I386_SOCKIOS__
-#define __ARCH_I386_SOCKIOS__
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-#endif
diff --git a/include/asm-x86/sockios_64.h b/include/asm-x86/sockios_64.h
deleted file mode 100644
index d726ba2513e3..000000000000
--- a/include/asm-x86/sockios_64.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_X8664_SOCKIOS__
-#define __ARCH_X8664_SOCKIOS__
-/* Socket-level I/O control calls. */
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
-#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
-#define SIOCGSTAMPNS    0x8907          /* Get stamp (timespec) */
-#endif
author	Roland Dreier <roland@digitalvampire.org>	2007-10-15 07:57:46 -0400
committer	Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de>	2007-10-17 14:17:09 -0400
commit	217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch)
tree	1f3ba24177455aeadcf065b9157ccac9252c7cfc
parent	020bd9f1c766ca743556461a70a5b5d559b7e60c (diff)

diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 0618ca386ab1..158deea39a54 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild
@@ -59,8 +59,6 @@ unifdef-y += siginfo_32.h
59	unifdef-y += siginfo_64.h	59	unifdef-y += siginfo_64.h
60	unifdef-y += signal_32.h	60	unifdef-y += signal_32.h
61	unifdef-y += signal_64.h	61	unifdef-y += signal_64.h
62	unifdef-y += sockios_32.h
63	unifdef-y += sockios_64.h
64	unifdef-y += stat_32.h	62	unifdef-y += stat_32.h
65	unifdef-y += stat_64.h	63	unifdef-y += stat_64.h
66	unifdef-y += statfs_32.h	64	unifdef-y += statfs_32.h


diff --git a/include/asm-x86/serial.h b/include/asm-x86/serial.h index cf1b05227b29..628c801535ea 100644 --- a/include/asm-x86/serial.h +++ b/include/asm-x86/serial.h
@@ -1,5 +1,29 @@
1	#ifdef CONFIG_X86_32	1	#ifndef _ASM_X86_SERIAL_H
2	# include "serial_32.h"	2	#define _ASM_X86_SERIAL_H
		3
		4	/*
		5	* This assumes you have a 1.8432 MHz clock for your UART.
		6	*
		7	* It'd be nice if someone built a serial card with a 24.576 MHz
		8	* clock, since the 16550A is capable of handling a top speed of 1.5
		9	* megabits/second; but this requires the faster clock.
		10	*/
		11	#define BASE_BAUD ( 1843200 / 16 )
		12
		13	/* Standard COM flags (except for COM4, because of the 8514 problem) */
		14	#ifdef CONFIG_SERIAL_DETECT_IRQ
		15	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)
		16	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)
3	#else	17	#else
4	# include "serial_64.h"	18	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)
		19	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
5	#endif	20	#endif
		21
		22	#define SERIAL_PORT_DFNS \
		23	/* UART CLK PORT IRQ FLAGS */ \
		24	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
		25	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
		26	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
		27	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
		28
		29	#endif /* _ASM_X86_SERIAL_H */


diff --git a/include/asm-x86/serial_32.h b/include/asm-x86/serial_32.h deleted file mode 100644 index bd67480ca109..000000000000 --- a/include/asm-x86/serial_32.h +++ /dev/null
@@ -1,29 +0,0 @@
1	/*
2	* include/asm-i386/serial.h
3	*/
4
5
6	/*
7	* This assumes you have a 1.8432 MHz clock for your UART.
8	*
9	* It'd be nice if someone built a serial card with a 24.576 MHz
10	* clock, since the 16550A is capable of handling a top speed of 1.5
11	* megabits/second; but this requires the faster clock.
12	*/
13	#define BASE_BAUD ( 1843200 / 16 )
14
15	/* Standard COM flags (except for COM4, because of the 8514 problem) */
16	#ifdef CONFIG_SERIAL_DETECT_IRQ
17	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)
18	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)
19	#else
20	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)
21	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
22	#endif
23
24	#define SERIAL_PORT_DFNS \
25	/* UART CLK PORT IRQ FLAGS */ \
26	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
27	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
28	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
29	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */


diff --git a/include/asm-x86/serial_64.h b/include/asm-x86/serial_64.h deleted file mode 100644 index b0496e0d72a6..000000000000 --- a/include/asm-x86/serial_64.h +++ /dev/null
@@ -1,29 +0,0 @@
1	/*
2	* include/asm-x86_64/serial.h
3	*/
4
5
6	/*
7	* This assumes you have a 1.8432 MHz clock for your UART.
8	*
9	* It'd be nice if someone built a serial card with a 24.576 MHz
10	* clock, since the 16550A is capable of handling a top speed of 1.5
11	* megabits/second; but this requires the faster clock.
12	*/
13	#define BASE_BAUD ( 1843200 / 16 )
14
15	/* Standard COM flags (except for COM4, because of the 8514 problem) */
16	#ifdef CONFIG_SERIAL_DETECT_IRQ
17	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)
18	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)
19	#else
20	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)
21	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
22	#endif
23
24	#define SERIAL_PORT_DFNS \
25	/* UART CLK PORT IRQ FLAGS */ \
26	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
27	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
28	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
29	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */


diff --git a/include/asm-x86/sockios.h b/include/asm-x86/sockios.h index 5a134fc70b9c..49cc72b5d3c9 100644 --- a/include/asm-x86/sockios.h +++ b/include/asm-x86/sockios.h
@@ -1,13 +1,13 @@
1	#ifdef __KERNEL__	1	#ifndef _ASM_X86_SOCKIOS_H
2	# ifdef CONFIG_X86_32	2	#define _ASM_X86_SOCKIOS_H
3	# include "sockios_32.h"	3
4	# else	4	/* Socket-level I/O control calls. */
5	# include "sockios_64.h"	5	#define FIOSETOWN 0x8901
6	# endif	6	#define SIOCSPGRP 0x8902
7	#else	7	#define FIOGETOWN 0x8903
8	# ifdef __i386__	8	#define SIOCGPGRP 0x8904
9	# include "sockios_32.h"	9	#define SIOCATMARK 0x8905
10	# else	10	#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
11	# include "sockios_64.h"	11	#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
12	# endif	12
13	#endif	13	#endif /* _ASM_X86_SOCKIOS_H */


diff --git a/include/asm-x86/sockios_32.h b/include/asm-x86/sockios_32.h deleted file mode 100644 index ff528c7d255c..000000000000 --- a/include/asm-x86/sockios_32.h +++ /dev/null
@@ -1,13 +0,0 @@
1	#ifndef __ARCH_I386_SOCKIOS__
2	#define __ARCH_I386_SOCKIOS__
3
4	/* Socket-level I/O control calls. */
5	#define FIOSETOWN 0x8901
6	#define SIOCSPGRP 0x8902
7	#define FIOGETOWN 0x8903
8	#define SIOCGPGRP 0x8904
9	#define SIOCATMARK 0x8905
10	#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
11	#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
12
13	#endif


diff --git a/include/asm-x86/sockios_64.h b/include/asm-x86/sockios_64.h deleted file mode 100644 index d726ba2513e3..000000000000 --- a/include/asm-x86/sockios_64.h +++ /dev/null
@@ -1,13 +0,0 @@
1	#ifndef __ARCH_X8664_SOCKIOS__
2	#define __ARCH_X8664_SOCKIOS__
3
4	/* Socket-level I/O control calls. */
5	#define FIOSETOWN 0x8901
6	#define SIOCSPGRP 0x8902
7	#define FIOGETOWN 0x8903
8	#define SIOCGPGRP 0x8904
9	#define SIOCATMARK 0x8905
10	#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
11	#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
12
13	#endif