Commit acee709c authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups',... 

Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus
parents 33a37eb4 5ff4789d 35b68055 c4dc59ae 7edf8891 9781f39f 48fe4a76 be54f9d1 77e44246 caadbdce 5e5a29bf e3a61b0a fec0962e fab3b58d f2ba9392 48ae7444 3cabf37f 7019cc2d 2ddf9b7b e66d90fb

Documentation/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			         or

			         memmap=0x10000$0x18690000



	memtest=	[KNL,X86_64] Enable memtest

	memtest=	[KNL,X86] Enable memtest

			Format: <integer>

			range: 0,4 : pattern number

			default : 0 <disable>
@@ -2158,6 +2158,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			Note that genuine overcurrent events won't be

			reported either.



	unknown_nmi_panic

			[X86-32,X86-64]

			Set unknown_nmi_panic=1 early on boot.



	usbcore.autosuspend=

			[USB] The autosuspend time delay (in seconds) used

			for newly-detected USB devices (default 2).  This

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ config PARAVIRT_DEBUG 


config MEMTEST

	bool "Memtest"

	depends on X86_64

	help

	  This option adds a kernel parameter 'memtest', which allows memtest

	  to be set.

arch/x86/Kconfig.cpu

+0 −4
Original line number Diff line number Diff line
@@ -362,10 +362,6 @@ config X86_ALIGNMENT_16 
	def_bool y

	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1



config X86_GOOD_APIC

	def_bool y

	depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON || MCORE2 || MVIAC7 || X86_64



config X86_INTEL_USERCOPY

	def_bool y

	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2

arch/x86/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ config CPA_DEBUG 


config OPTIMIZE_INLINING

	bool "Allow gcc to uninline functions marked 'inline'"

	depends on BROKEN

	help

	  This option determines if the kernel forces gcc to inline the functions

	  developers have marked 'inline'. Doing so takes away freedom from gcc to
@@ -300,5 +299,7 @@ config OPTIMIZE_INLINING 
	  become the default in the future, until then this option is there to

	  test gcc for this.



	  If unsure, say N.



endmenu

arch/x86/boot/edd.c

+2 −3
Original line number Diff line number Diff line
@@ -167,9 +167,8 @@ void query_edd(void) 
		 * Scan the BIOS-supported hard disks and query EDD

		 * information...

		 */

		get_edd_info(devno, &ei);



		if (boot_params.eddbuf_entries < EDDMAXNR) {

		if (!get_edd_info(devno, &ei)

		    && boot_params.eddbuf_entries < EDDMAXNR) {

			memcpy(edp, &ei, sizeof ei);

			edp++;

			boot_params.eddbuf_entries++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE