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

Commit 9b832153 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus 

* upstream/core:
  xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
  xen: set IO permission early (before early_cpu_init())
  xen: re-enable boot-time ballooning
  xen/balloon: make sure we only include remaining extra ram
  xen/balloon: the balloon_lock is useless
  xen: add extra pages to balloon
  xen/events: use locked set|clear_bit() for cpu_evtchn_mask
  xen/evtchn: clear secondary CPUs' cpu_evtchn_mask[] after restore
  xen: implement XENMEM_machphys_mapping

* upstream/xenfs:
  Revert "xen/privcmd: create address space to allow writable mmaps"
  xen/xenfs: update xenfs_mount for new prototype
  xen: fix header export to userspace
  xen: set vma flag VM_PFNMAP in the privcmd mmap file_op
  xen: xenfs: privcmd: check put_user() return code

* upstream/evtchn:
  xen: make evtchn's name less generic
  xen/evtchn: the evtchn device is non-seekable
  xen/evtchn: add missing static
  xen/evtchn: Fix name of Xen event-channel device
  xen/evtchn: don't do unbind_from_irqhandler under spinlock
  xen/evtchn: remove spurious barrier
  xen/evtchn: ports start enabled
  xen/evtchn: dynamically allocate port_user array
  xen/evtchn: track enabled state for each port
parents 12334715 9045d47e b5d827b6

Documentation/ABI/obsolete/proc-pid-oom_adj

0 → 100644
+22 −0
Original line number 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/kgdb.tmpl

+12 −1
Original line number Diff line number Diff line
@@ -710,7 +710,18 @@ Task Addr Pid Parent [*] cpu State Thread Command 
        <listitem><para>A simple shell</para></listitem>

        <listitem><para>The kdb core command set</para></listitem>

        <listitem><para>A registration API to register additional kdb shell commands.</para>

        <para>A good example of a self-contained kdb module is the "ftdump" command for dumping the ftrace buffer.  See: kernel/trace/trace_kdb.c</para></listitem>

	<itemizedlist>

        <listitem><para>A good example of a self-contained kdb module

        is the "ftdump" command for dumping the ftrace buffer.  See:

        kernel/trace/trace_kdb.c</para></listitem>

        <listitem><para>For an example of how to dynamically register

        a new kdb command you can build the kdb_hello.ko kernel module

        from samples/kdb/kdb_hello.c.  To build this example you can

        set CONFIG_SAMPLES=y and CONFIG_SAMPLE_KDB=m in your kernel

        config.  Later run "modprobe kdb_hello" and the next time you

        enter the kdb shell, you can run the "hello"

        command.</para></listitem>

	</itemizedlist></listitem>

        <listitem><para>The implementation for kdb_printf() which

        emits messages directly to I/O drivers, bypassing the kernel

        log.</para></listitem>

Documentation/arm/OMAP/DSS

+4 −3
Original line number Diff line number Diff line
@@ -255,9 +255,10 @@ framebuffer parameters. 
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,

Documentation/block/switching-sched.txt

+4 −4
Original line number 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

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

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).



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:



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

noop anticipatory deadline [cfq]

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

noop deadline [cfq]

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

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

noop [anticipatory] deadline cfq
 
noop [deadline] cfq

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -554,3 +554,13 @@ Why: This is a legacy interface which have been replaced by a more 
Who:    NeilBrown <neilb@suse.de>



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



What:	i2c_adapter.id

When:	June 2011

Why:	This field is deprecated. I2C device drivers shouldn't change their

	behavior based on the underlying I2C adapter. Instead, the I2C

	adapter driver should instantiate the I2C devices and provide the

	needed platform-specific information.

Who:	Jean Delvare <khali@linux-fr.org>



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