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

Commit 4ec3eb13 authored by Russell King's avatar Russell King
Browse files

Merge branch 'smp' into misc 

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
parents 24056f52 15095bb0

Documentation/ABI/obsolete/proc-pid-oom_adj

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
What:	/proc/<pid>/oom_adj

When:	August 2012

Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's

	badness heuristic used to determine which task to kill when the kernel

	is out of memory.



	The badness heuristic has since been rewritten since the introduction of

	this tunable such that its meaning is deprecated.  The value was

	implemented as a bitshift on a score generated by the badness()

	function that did not have any precise units of measure.  With the

	rewrite, the score is given as a proportion of available memory to the

	task allocating pages, so using a bitshift which grows the score

	exponentially is, thus, impossible to tune with fine granularity.



	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness() score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this

	deprecated interface.  After it is printed once, future warnings will be

	suppressed until the kernel is rebooted.

Documentation/DocBook/sh.tmpl

+0 −4
Original line number Original line Diff line number Diff line
@@ -79,10 +79,6 @@ 
      </sect2>

      </sect2>

    </sect1>

    </sect1>

  </chapter>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iinclude/linux/sh_clk.h

  </chapter>

  <chapter id="mach">

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

    <sect1 id="dreamcast">

Documentation/DocBook/uio-howto.tmpl

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
	</orgname>

	</orgname>





	<address>

	<address>

	   <email>hjk@linutronix.de</email>

	   <email>hjk@hansjkoch.de</email>

	</address>

	</address>

    </affiliation>

    </affiliation>

</author>

</author>
@@ -114,7 +114,7 @@ GPL version 2. 




<para>If you know of any translations for this document, or you are

<para>If you know of any translations for this document, or you are

interested in translating it, please email me

interested in translating it, please email me

<email>hjk@linutronix.de</email>.

<email>hjk@hansjkoch.de</email>.

</para>

</para>

</sect1>

</sect1>
@@ -171,7 +171,7 @@ interested in translating it, please email me 
<title>Feedback</title>

<title>Feedback</title>

	<para>Find something wrong with this document? (Or perhaps something

	<para>Find something wrong with this document? (Or perhaps something

	right?) I would love to hear from you. Please email me at

	right?) I would love to hear from you. Please email me at

	<email>hjk@linutronix.de</email>.</para>

	<email>hjk@hansjkoch.de</email>.</para>

</sect1>

</sect1>

</chapter>

</chapter>

Documentation/arm/OMAP/DSS

+4 −3
Original line number Original line Diff line number Diff line
@@ -255,9 +255,10 @@ framebuffer parameters. 
Kernel boot arguments

Kernel boot arguments

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

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





vram=<size>

vram=<size>[,<physaddr>]

	- Amount of total VRAM to preallocate. For example, "10M". omapfb

	- Amount of total VRAM to preallocate and optionally a physical start

	  allocates memory for framebuffers from VRAM.

	  memory address. For example, "10M". omapfb allocates memory for

	  framebuffers from VRAM.





omapfb.mode=<display>:<mode>[,...]

omapfb.mode=<display>:<mode>[,...]

	- Default video mode for specified displays. For example,

	- Default video mode for specified displays. For example,

Documentation/block/switching-sched.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ you can do so by typing: 
As of the Linux 2.6.10 kernel, it is now possible to change the

As of the Linux 2.6.10 kernel, it is now possible to change the

IO scheduler for a given block device on the fly (thus making it possible,

IO scheduler for a given block device on the fly (thus making it possible,

for instance, to set the CFQ scheduler for the system default, but

for instance, to set the CFQ scheduler for the system default, but

set a specific device to use the anticipatory or noop schedulers - which

set a specific device to use the deadline or noop schedulers - which

can improve that device's throughput).

can improve that device's throughput).





To set a specific scheduler, simply do this:

To set a specific scheduler, simply do this:
@@ -31,7 +31,7 @@ a "cat /sys/block/DEV/queue/scheduler" - the list of valid names 
will be displayed, with the currently selected scheduler in brackets:

will be displayed, with the currently selected scheduler in brackets:





# cat /sys/block/hda/queue/scheduler

# cat /sys/block/hda/queue/scheduler

noop anticipatory deadline [cfq]

noop deadline [cfq]

# echo anticipatory > /sys/block/hda/queue/scheduler

# echo deadline > /sys/block/hda/queue/scheduler

# cat /sys/block/hda/queue/scheduler

# cat /sys/block/hda/queue/scheduler

noop [anticipatory] deadline cfq
 
noop [deadline] cfq