Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf10fa85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Three small cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tty/serial/8250: Clean up the asm/serial.h include file a bit
  x86/tty/serial/8250: Resolve missing-field-initializers warnings
  x86: Remove obsolete comment in uapi/e820.h
parents 5941fe3b 196cf358

arch/x86/include/asm/serial.h

+12 −12
Original line number Diff line number Diff line
@@ -6,24 +6,24 @@ 
 *

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

 * megabits/second; but this requires a 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)

# define STD_COMX_FLAGS	(ASYNC_BOOT_AUTOCONF |	ASYNC_SKIP_TEST	| ASYNC_AUTO_IRQ)

# define STD_COM4_FLAGS	(ASYNC_BOOT_AUTOCONF |	0		| ASYNC_AUTO_IRQ)

#else

#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)

#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF

# define STD_COMX_FLAGS	(ASYNC_BOOT_AUTOCONF |	ASYNC_SKIP_TEST	| 0		)

# define STD_COM4_FLAGS	(ASYNC_BOOT_AUTOCONF |	0		| 0		)

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

	{ .uart = 0,	BASE_BAUD,	0x3F8,	4,	STD_COMX_FLAGS	}, /* ttyS0 */	\

	{ .uart = 0,	BASE_BAUD,	0x2F8,	3,	STD_COMX_FLAGS	}, /* ttyS1 */	\

	{ .uart = 0,	BASE_BAUD,	0x3E8,	4,	STD_COMX_FLAGS	}, /* ttyS2 */	\

	{ .uart = 0,	BASE_BAUD,	0x2E8,	3,	STD_COM4_FLAGS	}, /* ttyS3 */



#endif /* _ASM_X86_SERIAL_H */

arch/x86/include/uapi/asm/e820.h

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ 
 * this size.

 */



/*

 * Odd: 'make headers_check' complains about numa.h if I try

 * to collapse the next two #ifdef lines to a single line:

 *	#if defined(__KERNEL__) && defined(CONFIG_EFI)

 */

#ifndef __KERNEL__

#define E820_X_MAX E820MAX

#endif