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

Commit b5e4111f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'locking/urgent' into locking/core, before applying larger... 


Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 72d5305d 9de8033f

CREDITS

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ 
			Linus

			Linus

----------

----------





M: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator



N: Matti Aarnio

N: Matti Aarnio

E: mea@nic.funet.fi

E: mea@nic.funet.fi

D: Alpha systems hacking, IPv6 and other network related stuff

D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/Changes

+3 −6
Original line number Original line Diff line number Diff line
@@ -280,12 +280,9 @@ that is possible. 
mcelog

mcelog

------

------





In Linux 2.6.31+ the i386 kernel needs to run the mcelog utility

On x86 kernels the mcelog utility is needed to process and log machine check

as a regular cronjob similar to the x86-64 kernel to process and log

events when CONFIG_X86_MCE is enabled. Machine check events are errors reported

machine check events when CONFIG_X86_NEW_MCE is enabled. Machine check

by the CPU. Processing them is strongly encouraged.

events are errors reported by the CPU. Processing them is strongly encouraged.

All x86-64 kernels since 2.6.4 require the mcelog utility to

process machine checks.





Getting updated software

Getting updated software

========================

========================

Documentation/DocBook/gadget.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,7 @@ hardware level details could be very different. 




<para>Systems need specialized hardware support to implement OTG,

<para>Systems need specialized hardware support to implement OTG,

notably including a special <emphasis>Mini-AB</emphasis> jack

notably including a special <emphasis>Mini-AB</emphasis> jack

and associated transciever to support <emphasis>Dual-Role</emphasis>

and associated transceiver to support <emphasis>Dual-Role</emphasis>

operation:

operation:

they can act either as a host, using the standard

they can act either as a host, using the standard

Linux-USB host side driver stack,

Linux-USB host side driver stack,

Documentation/DocBook/genericirq.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ 
	<para>

	<para>

	Each interrupt is described by an interrupt descriptor structure

	Each interrupt is described by an interrupt descriptor structure

	irq_desc. The interrupt is referenced by an 'unsigned int' numeric

	irq_desc. The interrupt is referenced by an 'unsigned int' numeric

	value which selects the corresponding interrupt decription structure

	value which selects the corresponding interrupt description structure

	in the descriptor structures array.

	in the descriptor structures array.

	The descriptor structure contains status information and pointers

	The descriptor structure contains status information and pointers

	to the interrupt flow method and the interrupt chip structure

	to the interrupt flow method and the interrupt chip structure
@@ -470,7 +470,7 @@ if (desc->irq_data.chip->irq_eoi) 
     <para>

     <para>

       To avoid copies of identical implementations of IRQ chips the

       To avoid copies of identical implementations of IRQ chips the

       core provides a configurable generic interrupt chip

       core provides a configurable generic interrupt chip

       implementation. Developers should check carefuly whether the

       implementation. Developers should check carefully whether the

       generic chip fits their needs before implementing the same

       generic chip fits their needs before implementing the same

       functionality slightly differently themselves.

       functionality slightly differently themselves.

     </para>

     </para>

Documentation/DocBook/kernel-locking.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -1760,7 +1760,7 @@ as it would be on UP. 
</para>

</para>





<para>

<para>

There is a furthur optimization possible here: remember our original

There is a further optimization possible here: remember our original

cache code, where there were no reference counts and the caller simply

cache code, where there were no reference counts and the caller simply

held the lock whenever using the object?  This is still possible: if

held the lock whenever using the object?  This is still possible: if

you hold the lock, no one can delete the object, so you don't need to

you hold the lock, no one can delete the object, so you don't need to