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

Commit 888a8a3e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Merge reason: Pick up updates before queueing up dependent patches.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cfff2d90 b06b3d49

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.xz

*.lzo

*.patch

*.gcno

Documentation/DocBook/filesystems.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ 
     </sect1>

  </chapter>



  <chapter id="fs_events">

     <title>Events based on file descriptors</title>

!Efs/eventfd.c

  </chapter>



  <chapter id="sysfs">

     <title>The Filesystem for Exporting Kernel Objects</title>

!Efs/sysfs/file.c

Documentation/hwmon/jc42

+15 −6
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ Supported chips: 
  * JEDEC JC 42.4 compliant temperature sensor chips

    Prefix: 'jc42'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheet: -

    Datasheet:

	http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf



Author:

	Guenter Roeck <guenter.roeck@ericsson.com>
@@ -60,7 +61,11 @@ Author: 
Description

-----------



This driver implements support for JEDEC JC 42.4 compliant temperature sensors.

This driver implements support for JEDEC JC 42.4 compliant temperature sensors,

which are used on many DDR3 memory modules for mobile devices and servers. Some

systems use the sensor to prevent memory overheating by automatically throttling

the memory controller.



The driver auto-detects the chips listed above, but can be manually instantiated

to support other JC 42.4 compliant chips.
@@ -81,15 +86,19 @@ limits. The chip supports only a single register to configure the hysteresis, 
which applies to all limits. This register can be written by writing into

temp1_crit_hyst. Other hysteresis attributes are read-only.



If the BIOS has configured the sensor for automatic temperature management, it

is likely that it has locked the registers, i.e., that the temperature limits

cannot be changed.



Sysfs entries

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



temp1_input		Temperature (RO)

temp1_min		Minimum temperature (RW)

temp1_max		Maximum temperature (RW)

temp1_crit		Critical high temperature (RW)

temp1_min		Minimum temperature (RO or RW)

temp1_max		Maximum temperature (RO or RW)

temp1_crit		Critical high temperature (RO or RW)



temp1_crit_hyst		Critical hysteresis temperature (RW)

temp1_crit_hyst		Critical hysteresis temperature (RO or RW)

temp1_max_hyst		Maximum hysteresis temperature (RO)



temp1_min_alarm		Temperature low alarm

Documentation/hwmon/k10temp

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Supported chips: 
  Socket S1G3: Athlon II, Sempron, Turion II

* AMD Family 11h processors:

  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano"

* AMD Family 14h processors: "Brazos" (C/E/G-Series)



  Prefix: 'k10temp'

  Addresses scanned: PCI space
@@ -17,10 +19,14 @@ Supported chips: 
    http://support.amd.com/us/Processor_TechDocs/31116.pdf

  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 11h Processors:

    http://support.amd.com/us/Processor_TechDocs/41256.pdf

  BIOS and Kernel Developer's Guide (BKDG) for AMD Family 14h Models 00h-0Fh Processors:

    http://support.amd.com/us/Processor_TechDocs/43170.pdf

  Revision Guide for AMD Family 10h Processors:

    http://support.amd.com/us/Processor_TechDocs/41322.pdf

  Revision Guide for AMD Family 11h Processors:

    http://support.amd.com/us/Processor_TechDocs/41788.pdf

  Revision Guide for AMD Family 14h Models 00h-0Fh Processors:

    http://support.amd.com/us/Processor_TechDocs/47534.pdf

  AMD Family 11h Processor Power and Thermal Data Sheet for Notebooks:

    http://support.amd.com/us/Processor_TechDocs/43373.pdf

  AMD Family 10h Server and Workstation Processor Power and Thermal Data Sheet:
@@ -34,7 +40,7 @@ Description 
-----------



This driver permits reading of the internal temperature sensor of AMD

Family 10h and 11h processors.

Family 10h/11h/12h/14h processors.



All these processors have a sensor, but on those for Socket F or AM2+,

the sensor may return inconsistent values (erratum 319).  The driver

Documentation/kernel-parameters.txt

+16 −8
Original line number Diff line number Diff line
@@ -144,6 +144,11 @@ a fixed number of characters. This limit depends on the architecture 
and is between 256 and 4096 characters. It is defined in the file

./include/asm/setup.h as COMMAND_LINE_SIZE.



Finally, the [KMG] suffix is commonly described after a number of kernel

parameter values. These 'K', 'M', and 'G' letters represent the _binary_

multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30

bytes respectively. Such letter suffixes can also be entirely omitted.





	acpi=		[HW,ACPI,X86]

			Advanced Configuration and Power Interface
@@ -545,16 +550,20 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format:

			<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]



	crashkernel=nn[KMG]@ss[KMG]

			[KNL] Reserve a chunk of physical memory to

			hold a kernel to switch to with kexec on panic.

	crashkernel=size[KMG][@offset[KMG]]

			[KNL] Using kexec, Linux can switch to a 'crash kernel'

			upon panic. This parameter reserves the physical

			memory region [offset, offset + size] for that kernel

			image. If '@offset' is omitted, then a suitable offset

			is selected automatically. Check

			Documentation/kdump/kdump.txt for further details.



	crashkernel=range1:size1[,range2:size2,...][@offset]

			[KNL] Same as above, but depends on the memory

			in the running system. The syntax of range is

			start-[end] where start and end are both

			a memory unit (amount[KMG]). See also

			Documentation/kdump/kdump.txt for a example.

			Documentation/kdump/kdump.txt for an example.



	cs89x0_dma=	[HW,NET]

			Format: <dma>
@@ -1262,10 +1271,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			6 (KERN_INFO)		informational

			7 (KERN_DEBUG)		debug-level messages



	log_buf_len=n	Sets the size of the printk ring buffer, in bytes.

			Format: { n | nk | nM }

			n must be a power of two.  The default size

			is set in the kernel config file.

	log_buf_len=n[KMG]	Sets the size of the printk ring buffer,

			in bytes.  n must be a power of two.  The default

			size is set in the kernel config file.



	logo.nologo	[FB] Disables display of the built-in Linux logo.

			This may be used to provide more screen space for