Merge branch 'topic/workq-update' into topic/misc

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.

What:		/sys/bus/rbd/

Date:		November 2010

Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,

		Sage Weil <sage@newdream.net>

Description:

Being used for adding and removing rbd block devices.

Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]

 $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add

The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>

will be assigned for any registered block device. If snapshot is used, it will

be mapped read-only.

Removal of a device:

  $ echo <dev-id> > /sys/bus/rbd/remove

Entries under /sys/bus/rbd/devices/<dev-id>/

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

client_id

	The ceph unique client id that was assigned for this specific session.

major

	The block device major number.

name

	The name of the rbd image.

pool

	The pool where this rbd image resides. The pool-name pair is unique

	per rados system.

size

	The size (in bytes) of the mapped block device.

refresh

	Writing to this file will reread the image header data and set

	all relevant datastructures accordingly.

current_snap

	The current snapshot for which the device is mapped.

create_snap

	Create a snapshot:

	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create

rollback_snap

	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.

	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback

snap_*

	A directory per each snapshot

Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>

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

id

	The rados internal snapshot id assigned for this snapshot

size

	The size of the image when this snapshot was taken.

      </sect2>

    </sect1>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iinclude/linux/sh_clk.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

	</orgname>

	<address>

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

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

	</address>

    </affiliation>

</author>

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

interested in translating it, please email me

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

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

</para>

</sect1>

<title>Feedback</title>

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

	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>

</chapter>

Kernel boot arguments

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

vram=<size>

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

	  allocates memory for framebuffers from VRAM.

vram=<size>[,<physaddr>]

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

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

	  framebuffers from VRAM.

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

	- Default video mode for specified displays. For example,