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

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

Merge branch 'x86-core-for-linus' of... 

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

* 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
  x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
  x86: PAT: fix address types in track_pfn_vma_new()
  x86: prioritize the FPU traps for the error code
  x86: PAT: pfnmap documentation update changes
  x86: PAT: move track untrack pfnmap stubs to asm-generic
  x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
  x86: PAT: modify follow_phys to return phys_addr prot and return value
  x86: PAT: clarify is_linear_pfn_mapping() interface
  x86: ia32_signal: remove unnecessary declaration
  x86: common.c boot_cpu_stack and boot_exception_stacks should be static
  x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
  x86: fix warning in arch/x86/kernel/microcode_amd.c
  x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
  x86: asm-offset_64: use rt_sigframe_ia32
  x86: sigframe.h: include headers for dependency
  x86: traps.c declare functions before they get used
  x86: PAT: update documentation to cover pgprot and remap_pfn related changes - v3
  x86: PAT: add pgprot_writecombine() interface for drivers - v3
  x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
  x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
  ...
parents bb26c6c2 79a66b96

Documentation/feature-removal-schedule.txt

+0 −12
Original line number Diff line number Diff line
@@ -244,18 +244,6 @@ Who: Michael Buesch <mb@bu3sch.de> 


---------------------------



What:	init_mm export

When:	2.6.26

Why:	Not used in-tree. The current out-of-tree users used it to

	work around problems in the CPA code which should be resolved

	by now. One usecase was described to provide verification code

	of the CPA operation. That's a good idea in general, but such

	code / infrastructure should be in the kernel and not in some

	out-of-tree driver.

Who:	Thomas Gleixner <tglx@linutronix.de>



----------------------------



What:	usedac i386 kernel parameter

When:	2.6.27

Why:	replaced by allowdac and no dac combination

Documentation/filesystems/proc.txt

+6 −3
Original line number Diff line number Diff line
@@ -1339,10 +1339,13 @@ nmi_watchdog 


Enables/Disables the NMI watchdog on x86 systems.  When the value is non-zero

the NMI watchdog is enabled and will continuously test all online cpus to

determine whether or not they are still functioning properly.

determine whether or not they are still functioning properly. Currently,

passing "nmi_watchdog=" parameter at boot time is required for this function

to work.



Because the NMI watchdog shares registers with oprofile, by disabling the NMI

watchdog, oprofile may have more registers to utilize.

If LAPIC NMI watchdog method is in use (nmi_watchdog=2 kernel parameter), the

NMI watchdog shares registers with oprofile. By disabling the NMI watchdog,

oprofile may have more registers to utilize.



msgmni

------

Documentation/kernel-parameters.txt

+32 −1
Original line number Diff line number Diff line
@@ -1396,7 +1396,20 @@ and is between 256 and 4096 characters. It is defined in the file 
			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]



	nmi_watchdog=	[KNL,BUGS=X86-32] Debugging features for SMP kernels

	nmi_watchdog=	[KNL,BUGS=X86-32,X86-64] Debugging features for SMP kernels

			Format: [panic,][num]

			Valid num: 0,1,2

			0 - turn nmi_watchdog off

			1 - use the IO-APIC timer for the NMI watchdog

			2 - use the local APIC for the NMI watchdog using

			a performance counter. Note: This will use one performance

			counter and the local APIC's performance vector.

			When panic is specified panic when an NMI watchdog timeout occurs.

			This is useful when you use a panic=... timeout and need the box

			quickly up again.

			Instead of 1 and 2 it is possible to use the following

			symbolic names: lapic and ioapic

			Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic



	no387		[BUGS=X86-32] Tells the kernel to use the 387 maths

			emulation library even if a 387 maths coprocessor
@@ -1633,6 +1646,17 @@ and is between 256 and 4096 characters. It is defined in the file 
		nomsi		[MSI] If the PCI_MSI kernel config parameter is

				enabled, this kernel boot option can be used to

				disable the use of MSI interrupts system-wide.

		noioapicquirk	[APIC] Disable all boot interrupt quirks.

				Safety option to keep boot IRQs enabled. This

				should never be necessary.

		ioapicreroute	[APIC] Enable rerouting of boot IRQs to the

				primary IO-APIC for bridges that cannot disable

				boot IRQs. This fixes a source of spurious IRQs

				when the system masks IRQs.

		noioapicreroute	[APIC] Disable workaround that uses the

				boot IRQ equivalent of an IRQ that connects to

				a chipset where boot IRQs cannot be disabled.

				The opposite of ioapicreroute.

		biosirq		[X86-32] Use PCI BIOS calls to get the interrupt

				routing table. These calls are known to be buggy

				on several machines and they hang the machine
@@ -2262,6 +2286,13 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format:

			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>



	tsc=		Disable clocksource-must-verify flag for TSC.

			Format: <string>

			[x86] reliable: mark tsc clocksource as reliable, this

			disables clocksource verification at runtime.

			Used to enable high-resolution timer mode on older

			hardware, and in virtualized environment.



	turbografx.map[2|3]=	[HW,JOY]

			TurboGraFX parallel port interface

			Format:

Documentation/nmi_watchdog.txt

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ to the overall system performance. 
On x86 nmi_watchdog is disabled by default so you have to enable it with

a boot time parameter.



It's possible to disable the NMI watchdog in run-time by writing "0" to

/proc/sys/kernel/nmi_watchdog. Writing "1" to the same file will re-enable

the NMI watchdog. Notice that you still need to use "nmi_watchdog=" parameter

at boot time.



NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally

on x86 SMP boxes.

Documentation/x86/boot.txt

+3 −3
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ Protocol: 2.00+ 
	3  SYSLINUX

	4  EtherBoot

	5  ELILO

	7  GRuB

	7  GRUB

	8  U-BOOT

	9  Xen

	A  Gujin
@@ -537,8 +537,8 @@ Type: read 
Offset/size:	0x248/4

Protocol:	2.08+



  If non-zero then this field contains the offset from the end of the

  real-mode code to the payload.

  If non-zero then this field contains the offset from the beginning

  of the protected-mode code to the payload.



  The payload may be compressed. The format of both the compressed and

  uncompressed data should be determined using the standard magic