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

Commit 72a73693 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (160 commits)
  x86: remove extra calling to get ext cpuid level
  x86: use setup_clear_cpu_cap() when disabling the lapic
  KVM: fix exception entry / build bug, on 64-bit
  x86: add unknown_nmi_panic kernel parameter
  x86, VisWS: turn into generic arch, eliminate leftover files
  x86: add ->pre_time_init to x86_quirks
  x86: extend and use x86_quirks to clean up NUMAQ code
  x86: introduce x86_quirks
  x86: improve debug printout: add target bootmem range in early_res_to_bootmem()
  Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM
  x86: remove arch_get_ram_range
  x86: Add a debugfs interface to dump PAT memtype
  x86: Add a arch directory for x86 under debugfs
  x86: i386: reduce boot fixmap space
  i386/xen: add proper unwind annotations to xen_sysenter_target
  x86: reduce force_mwait visibility
  x86: reduce forbid_dac's visibility
  x86: fix two modpost warnings
  x86: check function status in EDD boot code
  x86_64: ia32_signal.c: remove signal number conversion
  ...
parents b7e6f62f 2e2dcc76

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

+7 −4
Original line number Diff line number Diff line
@@ -5,13 +5,15 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config NONPROMISC_DEVMEM

config STRICT_DEVMEM

	bool "Filter access to /dev/mem"

	help

	  If this option is left off, you allow userspace access to all

	  If this option is left on, you allow userspace (root) access to all

	  of memory, including kernel and userspace memory. Accidental

	  access to this is obviously disastrous, but specific access can

	  be used by people debugging the kernel.

	  be used by people debugging the kernel. Note that with PAT support

	  enabled, even in this case there are restrictions on /dev/mem

	  use due to the cache aliasing requirements.



	  If this option is switched on, the /dev/mem file only allows

	  userspace access to PCI space and the BIOS code and data regions.
@@ -287,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
@@ -298,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++;