Commit 48b1fddb authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'irq/numa' into x86/mce3 



Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents 38736072 ee4c24a5

Documentation/hwmon/sysfs-interface

+6 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,11 @@ fan[1-*]_min Fan minimum value 
		Unit: revolution/min (RPM)

		Unit: revolution/min (RPM)

		RW

		RW





fan[1-*]_max	Fan maximum value

		Unit: revolution/min (RPM)

		Only rarely supported by the hardware.

		RW



fan[1-*]_input	Fan input value.

fan[1-*]_input	Fan input value.

		Unit: revolution/min (RPM)

		Unit: revolution/min (RPM)

		RO

		RO
@@ -390,6 +395,7 @@ OR 
in[0-*]_min_alarm

in[0-*]_min_alarm

in[0-*]_max_alarm

in[0-*]_max_alarm

fan[1-*]_min_alarm

fan[1-*]_min_alarm

fan[1-*]_max_alarm

temp[1-*]_min_alarm

temp[1-*]_min_alarm

temp[1-*]_max_alarm

temp[1-*]_max_alarm

temp[1-*]_crit_alarm

temp[1-*]_crit_alarm

Documentation/input/multi-touch-protocol.txt

+79 −24
Original line number Original line Diff line number Diff line
@@ -18,8 +18,12 @@ Usage 
Anonymous finger details are sent sequentially as separate packets of ABS

Anonymous finger details are sent sequentially as separate packets of ABS

events. Only the ABS_MT events are recognized as part of a finger

events. Only the ABS_MT events are recognized as part of a finger

packet. The end of a packet is marked by calling the input_mt_sync()

packet. The end of a packet is marked by calling the input_mt_sync()

function, which generates a SYN_MT_REPORT event. The end of multi-touch

function, which generates a SYN_MT_REPORT event. This instructs the

transfer is marked by calling the usual input_sync() function.

receiver to accept the data for the current finger and prepare to receive

another. The end of a multi-touch transfer is marked by calling the usual

input_sync() function. This instructs the receiver to act upon events

accumulated since last EV_SYN/SYN_REPORT and prepare to receive a new

set of events/packets.





A set of ABS_MT events with the desired properties is defined. The events

A set of ABS_MT events with the desired properties is defined. The events

are divided into categories, to allow for partial implementation.  The

are divided into categories, to allow for partial implementation.  The
@@ -27,11 +31,26 @@ minimum set consists of ABS_MT_TOUCH_MAJOR, ABS_MT_POSITION_X and 
ABS_MT_POSITION_Y, which allows for multiple fingers to be tracked.  If the

ABS_MT_POSITION_Y, which allows for multiple fingers to be tracked.  If the

device supports it, the ABS_MT_WIDTH_MAJOR may be used to provide the size

device supports it, the ABS_MT_WIDTH_MAJOR may be used to provide the size

of the approaching finger. Anisotropy and direction may be specified with

of the approaching finger. Anisotropy and direction may be specified with

ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION. Devices with

ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION.  The

more granular information may specify general shapes as blobs, i.e., as a

ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a

sequence of rectangular shapes grouped together by an

finger or a pen or something else.  Devices with more granular information

ABS_MT_BLOB_ID. Finally, the ABS_MT_TOOL_TYPE may be used to specify

may specify general shapes as blobs, i.e., as a sequence of rectangular

whether the touching tool is a finger or a pen or something else.

shapes grouped together by an ABS_MT_BLOB_ID. Finally, for the few devices

that currently support it, the ABS_MT_TRACKING_ID event may be used to

report finger tracking from hardware [5].



Here is what a minimal event sequence for a two-finger touch would look

like:



   ABS_MT_TOUCH_MAJOR

   ABS_MT_POSITION_X

   ABS_MT_POSITION_Y

   SYN_MT_REPORT

   ABS_MT_TOUCH_MAJOR

   ABS_MT_POSITION_X

   ABS_MT_POSITION_Y

   SYN_MT_REPORT

   SYN_REPORT









Event Semantics

Event Semantics
@@ -44,24 +63,24 @@ ABS_MT_TOUCH_MAJOR 




The length of the major axis of the contact. The length should be given in

The length of the major axis of the contact. The length should be given in

surface units. If the surface has an X times Y resolution, the largest

surface units. If the surface has an X times Y resolution, the largest

possible value of ABS_MT_TOUCH_MAJOR is sqrt(X^2 + Y^2), the diagonal.

possible value of ABS_MT_TOUCH_MAJOR is sqrt(X^2 + Y^2), the diagonal [4].





ABS_MT_TOUCH_MINOR

ABS_MT_TOUCH_MINOR





The length, in surface units, of the minor axis of the contact. If the

The length, in surface units, of the minor axis of the contact. If the

contact is circular, this event can be omitted.

contact is circular, this event can be omitted [4].





ABS_MT_WIDTH_MAJOR

ABS_MT_WIDTH_MAJOR





The length, in surface units, of the major axis of the approaching

The length, in surface units, of the major axis of the approaching

tool. This should be understood as the size of the tool itself. The

tool. This should be understood as the size of the tool itself. The

orientation of the contact and the approaching tool are assumed to be the

orientation of the contact and the approaching tool are assumed to be the

same.

same [4].





ABS_MT_WIDTH_MINOR

ABS_MT_WIDTH_MINOR





The length, in surface units, of the minor axis of the approaching

The length, in surface units, of the minor axis of the approaching

tool. Omit if circular.

tool. Omit if circular [4].





The above four values can be used to derive additional information about

The above four values can be used to derive additional information about

the contact. The ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR approximates

the contact. The ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR approximates
@@ -70,14 +89,17 @@ different characteristic widths [1]. 




ABS_MT_ORIENTATION

ABS_MT_ORIENTATION





The orientation of the ellipse. The value should describe half a revolution

The orientation of the ellipse. The value should describe a signed quarter

clockwise around the touch center. The scale of the value is arbitrary, but

of a revolution clockwise around the touch center. The signed value range

zero should be returned for an ellipse aligned along the Y axis of the

is arbitrary, but zero should be returned for a finger aligned along the Y

surface. As an example, an index finger placed straight onto the axis could

axis of the surface, a negative value when finger is turned to the left, and

return zero orientation, something negative when twisted to the left, and

a positive value when finger turned to the right. When completely aligned with

something positive when twisted to the right. This value can be omitted if

the X axis, the range max should be returned.  Orientation can be omitted

the touching object is circular, or if the information is not available in

if the touching object is circular, or if the information is not available

the kernel driver.

in the kernel driver. Partial orientation support is possible if the device

can distinguish between the two axis, but not (uniquely) any values in

between. In such cases, the range of ABS_MT_ORIENTATION should be [0, 1]

[4].





ABS_MT_POSITION_X

ABS_MT_POSITION_X
@@ -98,8 +120,35 @@ ABS_MT_BLOB_ID 




The BLOB_ID groups several packets together into one arbitrarily shaped

The BLOB_ID groups several packets together into one arbitrarily shaped

contact. This is a low-level anonymous grouping, and should not be confused

contact. This is a low-level anonymous grouping, and should not be confused

with the high-level contactID, explained below. Most kernel drivers will

with the high-level trackingID [5]. Most kernel drivers will not have blob

not have this capability, and can safely omit the event.

capability, and can safely omit the event.



ABS_MT_TRACKING_ID



The TRACKING_ID identifies an initiated contact throughout its life cycle

[5]. There are currently only a few devices that support it, so this event

should normally be omitted.





Event Computation

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



The flora of different hardware unavoidably leads to some devices fitting

better to the MT protocol than others. To simplify and unify the mapping,

this section gives recipes for how to compute certain events.



For devices reporting contacts as rectangular shapes, signed orientation

cannot be obtained. Assuming X and Y are the lengths of the sides of the

touching rectangle, here is a simple formula that retains the most

information possible:



   ABS_MT_TOUCH_MAJOR := max(X, Y)

   ABS_MT_TOUCH_MINOR := min(X, Y)

   ABS_MT_ORIENTATION := bool(X > Y)



The range of ABS_MT_ORIENTATION should be set to [0, 1], to indicate that

the device can distinguish between a finger along the Y axis (0) and a

finger along the X axis (1).









Finger Tracking

Finger Tracking
@@ -109,14 +158,18 @@ The kernel driver should generate an arbitrary enumeration of the set of 
anonymous contacts currently on the surface. The order in which the packets

anonymous contacts currently on the surface. The order in which the packets

appear in the event stream is not important.

appear in the event stream is not important.





The process of finger tracking, i.e., to assign a unique contactID to each

The process of finger tracking, i.e., to assign a unique trackingID to each

initiated contact on the surface, is left to user space; preferably the

initiated contact on the surface, is left to user space; preferably the

multi-touch X driver [3]. In that driver, the contactID stays the same and

multi-touch X driver [3]. In that driver, the trackingID stays the same and

unique until the contact vanishes (when the finger leaves the surface). The

unique until the contact vanishes (when the finger leaves the surface). The

problem of assigning a set of anonymous fingers to a set of identified

problem of assigning a set of anonymous fingers to a set of identified

fingers is a euclidian bipartite matching problem at each event update, and

fingers is a euclidian bipartite matching problem at each event update, and

relies on a sufficiently rapid update rate.

relies on a sufficiently rapid update rate.





There are a few devices that support trackingID in hardware. User space can

make use of these native identifiers to reduce bandwidth and cpu usage.





Notes

Notes

-----

-----
@@ -136,5 +189,7 @@ could be used to derive tilt. 
time of writing (April 2009), the MT protocol is not yet merged, and the

time of writing (April 2009), the MT protocol is not yet merged, and the

prototype implements finger matching, basic mouse support and two-finger

prototype implements finger matching, basic mouse support and two-finger

scrolling. The project aims at improving the quality of current multi-touch

scrolling. The project aims at improving the quality of current multi-touch

functionality available in the synaptics X driver, and in addition

functionality available in the Synaptics X driver, and in addition

implement more advanced gestures.

implement more advanced gestures.

[4] See the section on event computation.

[5] See the section on finger tracking.

Documentation/kernel-parameters.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -1575,6 +1575,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	noinitrd	[RAM] Tells the kernel not to load any configured

	noinitrd	[RAM] Tells the kernel not to load any configured

			initial RAM disk.

			initial RAM disk.





	nointremap	[X86-64, Intel-IOMMU] Do not enable interrupt

			remapping.



	nointroute	[IA-64]

	nointroute	[IA-64]





	nojitter	[IA64] Disables jitter checking for ITC timers.

	nojitter	[IA64] Disables jitter checking for ITC timers.

Documentation/sound/alsa/Procfile.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,11 @@ card*/pcm*/xrun_debug 
	When this value is greater than 1, the driver will show the

	When this value is greater than 1, the driver will show the

	stack trace additionally.  This may help the debugging.

	stack trace additionally.  This may help the debugging.





	Since 2.6.30, this option also enables the hwptr check using

	jiffies.  This detects spontaneous invalid pointer callback

	values, but can be lead to too much corrections for a (mostly

	buggy) hardware that doesn't give smooth pointer updates.



card*/pcm*/sub*/info

card*/pcm*/sub*/info

	The general information of this PCM sub-stream.

	The general information of this PCM sub-stream.

MAINTAINERS

+12 −3
Original line number Original line Diff line number Diff line
@@ -434,7 +434,7 @@ F: arch/alpha/ 




AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER

AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER

P:	Thomas Dahlmann

P:	Thomas Dahlmann

M:	thomas.dahlmann@amd.com

M:	dahlmann.thomas@arcor.de

L:	linux-geode@lists.infradead.org (moderated for non-subscribers)

L:	linux-geode@lists.infradead.org (moderated for non-subscribers)

S:	Supported

S:	Supported

F:	drivers/usb/gadget/amd5536udc.*

F:	drivers/usb/gadget/amd5536udc.*
@@ -624,6 +624,7 @@ M: paulius.zaleckas@teltonika.lt 
L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

T:	git git://gitorious.org/linux-gemini/mainline.git

T:	git git://gitorious.org/linux-gemini/mainline.git

S:	Maintained

S:	Maintained

F:	arch/arm/mach-gemini/





ARM/EBSA110 MACHINE SUPPORT

ARM/EBSA110 MACHINE SUPPORT

P:	Russell King

P:	Russell King
@@ -650,6 +651,7 @@ P: Paulius Zaleckas 
M:	paulius.zaleckas@teltonika.lt

M:	paulius.zaleckas@teltonika.lt

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

S:	Maintained

S:	Maintained

F:	arch/arm/mm/*-fa*





ARM/FOOTBRIDGE ARCHITECTURE

ARM/FOOTBRIDGE ARCHITECTURE

P:	Russell King

P:	Russell King
@@ -1540,6 +1542,13 @@ W: http://www.fi.muni.cz/~kas/cosa/ 
S:	Maintained

S:	Maintained

F:	drivers/net/wan/cosa*

F:	drivers/net/wan/cosa*





CPMAC ETHERNET DRIVER

P:	Florian Fainelli

M:	florian@openwrt.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/cpmac.c



CPU FREQUENCY DRIVERS

CPU FREQUENCY DRIVERS

P:	Dave Jones

P:	Dave Jones

M:	davej@redhat.com

M:	davej@redhat.com
@@ -1971,8 +1980,8 @@ F: include/linux/edac.h 




EDAC-E752X

EDAC-E752X

P:	Mark Gross

P:	Mark Gross

P:	Doug Thompson

M:	mark.gross@intel.com

M:	mark.gross@intel.com

P:	Doug Thompson

M:	dougthompson@xmission.com

M:	dougthompson@xmission.com

L:	bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	bluesmoke.sourceforge.net

W:	bluesmoke.sourceforge.net
@@ -2249,7 +2258,7 @@ P: Li Yang 
M:	leoli@freescale.com

M:	leoli@freescale.com

P:	Zhang Wei

P:	Zhang Wei

M:	zw@zh-kernel.org

M:	zw@zh-kernel.org

L:	linuxppc-embedded@ozlabs.org

L:	linuxppc-dev@ozlabs.org

L:	linux-kernel@vger.kernel.org

L:	linux-kernel@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/dma/fsldma.*

F:	drivers/dma/fsldma.*