forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
- Loading branch information
Showing
7 changed files
with
40 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,29 @@ | ||
#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 */ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
#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 */ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.