Commit 217d115c authored by Roland Dreier's avatar Roland Dreier Committed by Thomas Gleixner
Browse files

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: default avatarRoland Dreier <roland@digitalvampire.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 020bd9f1

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -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

include/asm-x86/serial.h

+27 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "serial_32.h"

#ifndef _ASM_X86_SERIAL_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 */

include/asm-x86/serial_32.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * 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 */

include/asm-x86/serial_64.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * 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 */

include/asm-x86/sockios.h

+13 −13
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "sockios_32.h"

# else

#  include "sockios_64.h"

# endif

#else

# ifdef __i386__

#  include "sockios_32.h"

# else

#  include "sockios_64.h"

# endif

#endif
 
#ifndef _ASM_X86_SOCKIOS_H

#define _ASM_X86_SOCKIOS_H



/* 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 /* _ASM_X86_SOCKIOS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE