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

Commit b2782408 authored Sep 26, 2006 by Linus Torvalds

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
  [PATCH] Don't set calgary iommu as default y
  [PATCH] i386/x86-64: New Intel feature flags
  [PATCH] x86: Add a cumulative thermal throttle event counter.
  [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
  [PATCH] x86: Refactor thermal throttle processing
  [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
  [PATCH] Fix unwinder warning in traps.c
  [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
  [PATCH] x86: Move direct PCI scanning functions out of line
  [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
  [PATCH] Don't leak NT bit into next task
  [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
  [PATCH] Fix some broken white space in ia32_signal.c
  [PATCH] Initialize argument registers for 32bit signal handlers.
  [PATCH] Remove all traces of signal number conversion
  [PATCH] Don't synchronize time reading on single core AMD systems
  [PATCH] Remove outdated comment in x86-64 mmconfig code
  [PATCH] Use string instructions for Core2 copy/clear
  [PATCH] x86: - restore i8259A eoi status on resume
  [PATCH] i386: Split multi-line printk in oops output.
  ...

parents dd77a4ee 3f75f42d

Documentation/HOWTO

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -358,7 +358,8 @@ Here is a list of some of the different kernel trees available:
	quilt trees:		quilt trees:
	- USB, PCI, Driver Core, and I2C, Greg Kroah-Hartman <gregkh@suse.de>		- USB, PCI, Driver Core, and I2C, Greg Kroah-Hartman <gregkh@suse.de>
	kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/		kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
			- x86-64, partly i386, Andi Kleen <ak@suse.de>
			ftp.firstfloor.org:/pub/ak/x86_64/quilt/

	Bug Reporting		Bug Reporting
	-------------		-------------

Documentation/filesystems/proc.txt

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1124,11 +1124,15 @@ debugging information is displayed on console.
	NMI switch that most IA32 servers have fires unknown NMI up, for example.		NMI switch that most IA32 servers have fires unknown NMI up, for example.
	If a system hangs up, try pressing the NMI switch.		If a system hangs up, try pressing the NMI switch.

	[NOTE]		nmi_watchdog
	This function and oprofile share a NMI callback. Therefore this function		------------
	cannot be enabled when oprofile is activated.
	And NMI watchdog will be disabled when the value in this file is set to		Enables/Disables the NMI watchdog on x86 systems. When the value is non-zero
	non-zero.		the NMI watchdog is enabled and will continuously test all online cpus to
			determine whether or not they are still functioning properly.

			Because the NMI watchdog shares registers with oprofile, by disabling the NMI
			watchdog, oprofile may have more registers to utilize.


	2.4 /proc/sys/vm - The virtual memory subsystem		2.4 /proc/sys/vm - The virtual memory subsystem

Documentation/kbuild/makefiles.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -421,6 +421,11 @@ more details, with real examples.
	The second argument is optional, and if supplied will be used		The second argument is optional, and if supplied will be used
	if first argument is not supported.		if first argument is not supported.

			as-instr
			as-instr checks if the assembler reports a specific instruction
			and then outputs either option1 or option2
			C escapes are supported in the test instruction

	cc-option		cc-option
	cc-option is used to check if $(CC) supports a given option, and not		cc-option is used to check if $(CC) supports a given option, and not
	supported to use an optional second option.		supported to use an optional second option.

Documentation/kernel-parameters.txt

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1240,7 +1240,11 @@ running once the system is up.
	bootloader. This is currently used on		bootloader. This is currently used on
	IXP2000 systems where the bus has to be		IXP2000 systems where the bus has to be
	configured a certain way for adjunct CPUs.		configured a certain way for adjunct CPUs.
			noearly [X86] Don't do any early type 1 scanning.
			This might help on some broken boards which
			machine check when some devices' config space
			is read. But various workarounds are disabled
			and some IOMMU drivers will not work.
	pcmv= [HW,PCMCIA] BadgePAD 4		pcmv= [HW,PCMCIA] BadgePAD 4

	pd. [PARIDE]		pd. [PARIDE]

Documentation/x86_64/boot-options.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -245,6 +245,13 @@ Debugging
	newfallback: use new unwinder but fall back to old if it gets		newfallback: use new unwinder but fall back to old if it gets
	stuck (default)		stuck (default)

			call_trace=[old\|both\|newfallback\|new]
			old: use old inexact backtracer
			new: use new exact dwarf2 unwinder
			both: print entries from both
			newfallback: use new unwinder but fall back to old if it gets
			stuck (default)

	Misc		Misc

	noreplacement Don't replace instructions with more appropriate ones		noreplacement Don't replace instructions with more appropriate ones