Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc',... (3560adf6) · Commits · 戴 / test

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ modules.builtin
		tags
		TAGS
		vmlinux
		vmlinuz
		System.map
		Module.markers
		Module.symvers

Documentation/cachetlb.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -88,12 +88,12 @@ changes occur:
		This is used primarily during fault processing.

		5) void update_mmu_cache(struct vm_area_struct *vma,
		unsigned long address, pte_t pte)
		unsigned long address, pte_t *ptep)

		At the end of every page fault, this routine is invoked to
		tell the architecture specific code that a translation
		described by "pte" now exists at virtual address "address"
		for address space "vma->vm_mm", in the software page tables.
		now exists at virtual address "address" for address space
		"vma->vm_mm", in the software page tables.

		A port may use this information in any way it so chooses.
		For example, it could use this event to pre-load TLB

Documentation/feature-removal-schedule.txt

+49 −0

Original line number	Diff line number	Diff line
		@@ -493,3 +493,52 @@ Why: These two features use non-standard interfaces. There are the
		Who: Corentin Chary <corentin.chary@gmail.com>

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

		What: usbvideo quickcam_messenger driver
		When: 2.6.35
		Files: drivers/media/video/usbvideo/quickcam_messenger.[ch]
		Why: obsolete v4l1 driver replaced by gspca_stv06xx
		Who: Hans de Goede <hdegoede@redhat.com>

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

		What: ov511 v4l1 driver
		When: 2.6.35
		Files: drivers/media/video/ov511.[ch]
		Why: obsolete v4l1 driver replaced by gspca_ov519
		Who: Hans de Goede <hdegoede@redhat.com>

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

		What: w9968cf v4l1 driver
		When: 2.6.35
		Files: drivers/media/video/w9968cf*.[ch]
		Why: obsolete v4l1 driver replaced by gspca_ov519
		Who: Hans de Goede <hdegoede@redhat.com>

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

		What: ovcamchip sensor framework
		When: 2.6.35
		Files: drivers/media/video/ovcamchip/*
		Why: Only used by obsoleted v4l1 drivers
		Who: Hans de Goede <hdegoede@redhat.com>

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

		What: stv680 v4l1 driver
		When: 2.6.35
		Files: drivers/media/video/stv680.[ch]
		Why: obsolete v4l1 driver replaced by gspca_stv0680
		Who: Hans de Goede <hdegoede@redhat.com>

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

		What: zc0301 v4l driver
		When: 2.6.35
		Files: drivers/media/video/zc0301/*
		Why: Duplicate functionality with the gspca_zc3xx driver, zc0301 only
		supports 2 USB-ID's (because it only supports a limited set of
		sensors) wich are also supported by the gspca_zc3xx driver
		(which supports 53 USB-ID's in total)
		Who: Hans de Goede <hdegoede@redhat.com>

Documentation/filesystems/proc.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -177,7 +177,6 @@ read the file /proc/PID/status:
		CapBnd: ffffffffffffffff
		voluntary_ctxt_switches: 0
		nonvoluntary_ctxt_switches: 1
		Stack usage: 12 kB

		This shows you nearly the same information you would get if you viewed it with
		the ps command. In fact, ps uses the proc file system to obtain its
		@@ -231,7 +230,6 @@ Table 1-2: Contents of the statm files (as of 2.6.30-rc7)
		Mems_allowed_list Same as previous, but in "list format"
		voluntary_ctxt_switches number of voluntary context switches
		nonvoluntary_ctxt_switches number of non voluntary context switches
		Stack usage: stack usage high water mark (round up to page size)
		..............................................................................

		Table 1-3: Contents of the statm files (as of 2.6.8-rc3)

Documentation/hwmon/amc6821

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		Kernel driver amc6821
		=====================

		Supported chips:
		Texas Instruments AMC6821
		Prefix: 'amc6821'
		Addresses scanned: 0x18, 0x19, 0x1a, 0x2c, 0x2d, 0x2e, 0x4c, 0x4d, 0x4e
		Datasheet: http://focus.ti.com/docs/prod/folders/print/amc6821.html

		Authors:
		Tomaz Mertelj <tomaz.mertelj@guest.arnes.si>


		Description
		-----------

		This driver implements support for the Texas Instruments amc6821 chip.
		The chip has one on-chip and one remote temperature sensor and one pwm fan
		regulator.
		The pwm can be controlled either from software or automatically.

		The driver provides the following sensor accesses in sysfs:

		temp1_input ro on-chip temperature
		temp1_min rw "
		temp1_max rw "
		temp1_crit rw "
		temp1_min_alarm ro "
		temp1_max_alarm ro "
		temp1_crit_alarm ro "

		temp2_input ro remote temperature
		temp2_min rw "
		temp2_max rw "
		temp2_crit rw "
		temp2_min_alarm ro "
		temp2_max_alarm ro "
		temp2_crit_alarm ro "
		temp2_fault ro "

		fan1_input ro tachometer speed
		fan1_min rw "
		fan1_max rw "
		fan1_fault ro "
		fan1_div rw Fan divisor can be either 2 or 4.

		pwm1 rw pwm1
		pwm1_enable rw regulator mode, 1=open loop, 2=fan controlled
		by remote temperature, 3=fan controlled by
		combination of the on-chip temperature and
		remote-sensor temperature,
		pwm1_auto_channels_temp ro 1 if pwm_enable==2, 3 if pwm_enable==3
		pwm1_auto_point1_pwm ro Hardwired to 0, shared for both
		temperature channels.
		pwm1_auto_point2_pwm rw This value is shared for both temperature
		channels.
		pwm1_auto_point3_pwm rw Hardwired to 255, shared for both
		temperature channels.

		temp1_auto_point1_temp ro Hardwired to temp2_auto_point1_temp
		which is rw. Below this temperature fan stops.
		temp1_auto_point2_temp rw The low-temperature limit of the proportional
		range. Below this temperature
		pwm1 = pwm1_auto_point2_pwm. It can go from
		0 degree C to 124 degree C in steps of
		4 degree C. Read it out after writing to get
		the actual value.
		temp1_auto_point3_temp rw Above this temperature fan runs at maximum
		speed. It can go from temp1_auto_point2_temp.
		It can only have certain discrete values
		which depend on temp1_auto_point2_temp and
		pwm1_auto_point2_pwm. Read it out after
		writing to get the actual value.

		temp2_auto_point1_temp rw Must be between 0 degree C and 63 degree C and
		it defines the passive cooling temperature.
		Below this temperature the fan stops in
		the closed loop mode.
		temp2_auto_point2_temp rw The low-temperature limit of the proportional
		range. Below this temperature
		pwm1 = pwm1_auto_point2_pwm. It can go from
		0 degree C to 124 degree C in steps
		of 4 degree C.

		temp2_auto_point3_temp rw Above this temperature fan runs at maximum
		speed. It can only have certain discrete
		values which depend on temp2_auto_point2_temp
		and pwm1_auto_point2_pwm. Read it out after
		writing to get actual value.


		Module parameters
		-----------------

		If your board has a BIOS that initializes the amc6821 correctly, you should
		load the module with: init=0.

		If your board BIOS doesn't initialize the chip, or you want
		different settings, you can set the following parameters:
		init=1,
		pwminv: 0 default pwm output, 1 inverts pwm output.

Admin message