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

Commit 91056a63 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup

parents 05d900c9 f2d8df92

Documentation/ABI/testing/sysfs-class-scsi_host

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/class/scsi_host/hostX/isci_id

Date:		June 2011

Contact:	Dave Jiang <dave.jiang@intel.com>

Description:

		This file contains the enumerated host ID for the Intel

		SCU controller. The Intel(R) C600 Series Chipset SATA/SAS

		Storage Control Unit embeds up to two 4-port controllers in

		a single PCI device.  The controllers are enumerated in order

		which usually means the lowest number scsi_host corresponds

		with the first controller, but this association is not

		guaranteed.  The 'isci_id' attribute unambiguously identifies

		the controller index: '0' for the first controller,

		'1' for the second.

Documentation/DocBook/media/v4l/controls.xml

+19 −19
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-vui-sar-idc">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>

	      </row>
@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>

	      </row>
@@ -1641,7 +1641,7 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>

	      </row>
@@ -1689,9 +1689,9 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_profile</entry>

	      </row>

	      <row><entry spanname="descr">The profile information for H264.

Applicable to the H264 encoder.
@@ -1774,9 +1774,9 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mpeg4_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_profile</entry>

	      </row>

	      <row><entry spanname="descr">The profile information for MPEG4.

Applicable to the MPEG4 encoder.
@@ -1820,9 +1820,9 @@ Applicable to the encoder. 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-multi-slice-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_multi_slice_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_multi_slice_mode</entry>

	      </row>

	      <row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.

Applicable to the encoder.
@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-loop-filter-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_loop_filter_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_loop_filter_mode</entry>

	      </row>

	      <row><entry spanname="descr">Loop filter mode for H264 encoder.

Possible values are:</entry>
@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-entropy-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_symbol_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_entropy_mode</entry>

	      </row>

	      <row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.

Applicable to the H264 encoder.
@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-header-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_header_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_header_mode</entry>

	      </row>

	      <row><entry spanname="descr">Determines whether the header is returned as the first buffer or is

it returned together with the first frame. Applicable to encoders.
@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE 
Applicable to the H264 encoder.</entry>

	      </row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-frame-skip-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_frame_skip_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_frame_skip_mode</entry>

	      </row>

	      <row><entry spanname="descr">

Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders. 
</entry>

	      </row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-force-frame-type">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_force_frame_type</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_force_frame_type</entry>

	      </row>

	      <row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.

Possible values are:</entry>

Documentation/cgroups/memory.txt

+1 −84
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ will be charged as a new owner of it. 


5.2 stat file



5.2.1 memory.stat file includes following statistics

memory.stat file includes following statistics



# per-memory cgroup local status

cache		- # of bytes of page cache memory.
@@ -438,89 +438,6 @@ Note: 
	 file_mapped is accounted only when the memory cgroup is owner of page

	 cache.)



5.2.2 memory.vmscan_stat



memory.vmscan_stat includes statistics information for memory scanning and

freeing, reclaiming. The statistics shows memory scanning information since

memory cgroup creation and can be reset to 0 by writing 0 as



 #echo 0 > ../memory.vmscan_stat



This file contains following statistics.



[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy]

[param]_elapsed_ns_by_[reason]_[under_hierarchy]



For example,



  scanned_file_pages_by_limit indicates the number of scanned

  file pages at vmscan.



Now, 3 parameters are supported



  scanned - the number of pages scanned by vmscan

  rotated - the number of pages activated at vmscan

  freed   - the number of pages freed by vmscan



If "rotated" is high against scanned/freed, the memcg seems busy.



Now, 2 reason are supported



  limit - the memory cgroup's limit

  system - global memory pressure + softlimit

           (global memory pressure not under softlimit is not handled now)



When under_hierarchy is added in the tail, the number indicates the

total memcg scan of its children and itself.



elapsed_ns is a elapsed time in nanosecond. This may include sleep time

and not indicates CPU usage. So, please take this as just showing

latency.



Here is an example.



# cat /cgroup/memory/A/memory.vmscan_stat

scanned_pages_by_limit 9471864

scanned_anon_pages_by_limit 6640629

scanned_file_pages_by_limit 2831235

rotated_pages_by_limit 4243974

rotated_anon_pages_by_limit 3971968

rotated_file_pages_by_limit 272006

freed_pages_by_limit 2318492

freed_anon_pages_by_limit 962052

freed_file_pages_by_limit 1356440

elapsed_ns_by_limit 351386416101

scanned_pages_by_system 0

scanned_anon_pages_by_system 0

scanned_file_pages_by_system 0

rotated_pages_by_system 0

rotated_anon_pages_by_system 0

rotated_file_pages_by_system 0

freed_pages_by_system 0

freed_anon_pages_by_system 0

freed_file_pages_by_system 0

elapsed_ns_by_system 0

scanned_pages_by_limit_under_hierarchy 9471864

scanned_anon_pages_by_limit_under_hierarchy 6640629

scanned_file_pages_by_limit_under_hierarchy 2831235

rotated_pages_by_limit_under_hierarchy 4243974

rotated_anon_pages_by_limit_under_hierarchy 3971968

rotated_file_pages_by_limit_under_hierarchy 272006

freed_pages_by_limit_under_hierarchy 2318492

freed_anon_pages_by_limit_under_hierarchy 962052

freed_file_pages_by_limit_under_hierarchy 1356440

elapsed_ns_by_limit_under_hierarchy 351386416101

scanned_pages_by_system_under_hierarchy 0

scanned_anon_pages_by_system_under_hierarchy 0

scanned_file_pages_by_system_under_hierarchy 0

rotated_pages_by_system_under_hierarchy 0

rotated_anon_pages_by_system_under_hierarchy 0

rotated_file_pages_by_system_under_hierarchy 0

freed_pages_by_system_under_hierarchy 0

freed_anon_pages_by_system_under_hierarchy 0

freed_file_pages_by_system_under_hierarchy 0

elapsed_ns_by_system_under_hierarchy 0



5.3 swappiness



Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -592,3 +592,11 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
	interface that was used by acer-wmi driver. It will replaced by

	information log when acer-wmi initial.

Who:    Lee, Chun-Yi <jlee@novell.com>



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

What:	The XFS nodelaylog mount option

When:	3.3

Why:	The delaylog mode that has been the default since 2.6.39 has proven

	stable, and the old code is in the way of additional improvements in

	the log code.

Who:	Christoph Hellwig <hch@lst.de>

Documentation/hwmon/coretemp

+4 −10
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ the Out-Of-Spec bit. Following table summarizes the exported sysfs files: 
All Sysfs entries are named with their core_id (represented here by 'X').

tempX_input	 - Core temperature (in millidegrees Celsius).

tempX_max	 - All cooling devices should be turned on (on Core2).

		   Initialized with IA32_THERM_INTERRUPT. When the CPU

		   temperature reaches this temperature, an interrupt is

		   generated and tempX_max_alarm is set.

tempX_max_hyst   - If the CPU temperature falls below than temperature,

		   an interrupt is generated and tempX_max_alarm is reset.

tempX_max_alarm  - Set if the temperature reaches or exceeds tempX_max.

		   Reset if the temperature drops to or below tempX_max_hyst.

tempX_crit	 - Maximum junction temperature (in millidegrees Celsius).

tempX_crit_alarm - Set when Out-of-spec bit is set, never clears.

		   Correct CPU operation is no longer guaranteed.
@@ -49,9 +42,10 @@ tempX_label - Contains string "Core X", where X is processor 
		   number. For Package temp, this will be "Physical id Y",

		   where Y is the package number.



The TjMax temperature is set to 85 degrees C if undocumented model specific

register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as

(sometimes) documented in processor datasheet.

On CPU models which support it, TjMax is read from a model-specific register.

On other models, it is set to an arbitrary value based on weak heuristics.

If these heuristics don't work for you, you can pass the correct TjMax value

as a module parameter (tjmax).



Appendix A. Known TjMax lists (TBD):

Some information comes from ark.intel.com