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

Commit 61c5504a authored by Kumar Gala's avatar Kumar Gala
Browse files

Merge branch 'master'

parents 9585da37 2c276603
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG
S: England
S: England


N: Chris Wright
N: Chris Wright
E: chrisw@osdl.org
E: chrisw@sous-sol.org
D: hacking on LSM framework and security modules.
D: hacking on LSM framework and security modules.
S: c/o OSDL
S: Portland, OR
S: 12725 SW Millikan Way, Suite 400
S: Beaverton, OR 97005
S: USA
S: USA


N: Michal Wronski
N: Michal Wronski
+14 −27
Original line number Original line Diff line number Diff line
@@ -4,8 +4,9 @@
Copyright (C) 2004 BULL SA.
Copyright (C) 2004 BULL SA.
Written by Simon.Derr@bull.net
Written by Simon.Derr@bull.net


Portions Copyright (c) 2004 Silicon Graphics, Inc.
Portions Copyright (c) 2004-2006 Silicon Graphics, Inc.
Modified by Paul Jackson <pj@sgi.com>
Modified by Paul Jackson <pj@sgi.com>
Modified by Christoph Lameter <clameter@sgi.com>


CONTENTS:
CONTENTS:
=========
=========
@@ -90,7 +91,8 @@ This can be especially valuable on:


These subsets, or "soft partitions" must be able to be dynamically
These subsets, or "soft partitions" must be able to be dynamically
adjusted, as the job mix changes, without impacting other concurrently
adjusted, as the job mix changes, without impacting other concurrently
executing jobs.
executing jobs. The location of the running jobs pages may also be moved
when the memory locations are changed.


The kernel cpuset patch provides the minimum essential kernel
The kernel cpuset patch provides the minimum essential kernel
mechanisms required to efficiently implement such subsets.  It
mechanisms required to efficiently implement such subsets.  It
@@ -102,8 +104,8 @@ memory allocator code.
1.3 How are cpusets implemented ?
1.3 How are cpusets implemented ?
---------------------------------
---------------------------------


Cpusets provide a Linux kernel (2.6.7 and above) mechanism to constrain
Cpusets provide a Linux kernel mechanism to constrain which CPUs and
which CPUs and Memory Nodes are used by a process or set of processes.
Memory Nodes are used by a process or set of processes.


The Linux kernel already has a pair of mechanisms to specify on which
The Linux kernel already has a pair of mechanisms to specify on which
CPUs a task may be scheduled (sched_setaffinity) and on which Memory
CPUs a task may be scheduled (sched_setaffinity) and on which Memory
@@ -371,22 +373,17 @@ cpusets memory placement policy 'mems' subsequently changes.
If the cpuset flag file 'memory_migrate' is set true, then when
If the cpuset flag file 'memory_migrate' is set true, then when
tasks are attached to that cpuset, any pages that task had
tasks are attached to that cpuset, any pages that task had
allocated to it on nodes in its previous cpuset are migrated
allocated to it on nodes in its previous cpuset are migrated
to the tasks new cpuset.  Depending on the implementation,
to the tasks new cpuset. The relative placement of the page within
this migration may either be done by swapping the page out,
the cpuset is preserved during these migration operations if possible.
so that the next time the page is referenced, it will be paged
For example if the page was on the second valid node of the prior cpuset
into the tasks new cpuset, usually on the node where it was
then the page will be placed on the second valid node of the new cpuset.
referenced, or this migration may be done by directly copying

the pages from the tasks previous cpuset to the new cpuset,
where possible to the same node, relative to the new cpuset,
as the node that held the page, relative to the old cpuset.
Also if 'memory_migrate' is set true, then if that cpusets
Also if 'memory_migrate' is set true, then if that cpusets
'mems' file is modified, pages allocated to tasks in that
'mems' file is modified, pages allocated to tasks in that
cpuset, that were on nodes in the previous setting of 'mems',
cpuset, that were on nodes in the previous setting of 'mems',
will be moved to nodes in the new setting of 'mems.'  Again,
will be moved to nodes in the new setting of 'mems.'
depending on the implementation, this might be done by swapping,
Pages that were not in the tasks prior cpuset, or in the cpusets
or by direct copying.  In either case, pages that were not in
prior 'mems' setting, will not be moved.
the tasks prior cpuset, or in the cpusets prior 'mems' setting,
will not be moved.


There is an exception to the above.  If hotplug functionality is used
There is an exception to the above.  If hotplug functionality is used
to remove all the CPUs that are currently assigned to a cpuset,
to remove all the CPUs that are currently assigned to a cpuset,
@@ -434,16 +431,6 @@ and then start a subshell 'sh' in that cpuset:
  # The next line should display '/Charlie'
  # The next line should display '/Charlie'
  cat /proc/self/cpuset
  cat /proc/self/cpuset


In the case that a change of cpuset includes wanting to move already
allocated memory pages, consider further the work of IWAMOTO
Toshihiro <iwamoto@valinux.co.jp> for page remapping and memory
hotremoval, which can be found at:

  http://people.valinux.co.jp/~iwamoto/mh.html

The integration of cpusets with such memory migration is not yet
available.

In the future, a C library interface to cpusets will likely be
In the future, a C library interface to cpusets will likely be
available.  For now, the only way to query or modify cpusets is
available.  For now, the only way to query or modify cpusets is
via the cpuset file system, using the various cd, mkdir, echo, cat,
via the cpuset file system, using the various cd, mkdir, echo, cat,
+5 −1
Original line number Original line Diff line number Diff line
@@ -111,4 +111,8 @@ source: linux/Documentation/video4linux/CARDLIST.bttv
If you have problems with this please do ask on the mailing list.
If you have problems with this please do ask on the mailing list.


--
--
Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham
Authors: Richard Walker,
	 Jamie Honan,
	 Michael Hunold,
	 Manu Abraham,
	 Michael Krufky
+9 −0
Original line number Original line Diff line number Diff line
@@ -180,3 +180,12 @@ Why: These events are not correct, and do not properly let userspace know
	when a file system has been mounted or unmounted.  Userspace should
	when a file system has been mounted or unmounted.  Userspace should
	poll the /proc/mounts file instead to detect this properly.
	poll the /proc/mounts file instead to detect this properly.
Who:	Greg Kroah-Hartman <gregkh@suse.de>
Who:	Greg Kroah-Hartman <gregkh@suse.de>

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

What:	Support for NEC DDB5074 and DDB5476 evaluation boards.
When:	June 2006
Why:	Board specific code doesn't build anymore since ~2.6.0 and no
	users have complained indicating there is no more need for these
	boards.  This should really be considered a last call.
Who:	Ralf Baechle <ralf@linux-mips.org>
+21 −0
Original line number Original line Diff line number Diff line
@@ -335,6 +335,12 @@ running once the system is up.
			timesource is not avalible, it defaults to PIT.
			timesource is not avalible, it defaults to PIT.
			Format: { pit | tsc | cyclone | pmtmr }
			Format: { pit | tsc | cyclone | pmtmr }


	disable_8254_timer
	enable_8254_timer
			[IA32/X86_64] Disable/Enable interrupt 0 timer routing
			over the 8254 in addition to over the IO-APIC. The
			kernel tries to set a sensible default.

	hpet=		[IA-32,HPET] option to disable HPET and use PIT.
	hpet=		[IA-32,HPET] option to disable HPET and use PIT.
			Format: disable
			Format: disable


@@ -1034,6 +1040,8 @@ running once the system is up.


	nomce		[IA-32] Machine Check Exception
	nomce		[IA-32] Machine Check Exception


	nomca		[IA-64] Disable machine check abort handling

	noresidual	[PPC] Don't use residual data on PReP machines.
	noresidual	[PPC] Don't use residual data on PReP machines.


	noresume	[SWSUSP] Disables resume and restores original swap
	noresume	[SWSUSP] Disables resume and restores original swap
@@ -1282,6 +1290,19 @@ running once the system is up.
			New name for the ramdisk parameter.
			New name for the ramdisk parameter.
			See Documentation/ramdisk.txt.
			See Documentation/ramdisk.txt.


	rcu.blimit=	[KNL,BOOT] Set maximum number of finished
			RCU callbacks to process in one batch.

	rcu.qhimark=	[KNL,BOOT] Set threshold of queued
			RCU callbacks over which batch limiting is disabled.

	rcu.qlowmark=	[KNL,BOOT] Set threshold of queued
			RCU callbacks below which batch limiting is re-enabled.

	rcu.rsinterval=	[KNL,BOOT,SMP] Set the number of additional
			RCU callbacks to queued before forcing reschedule
			on all cpus.

	rdinit=		[KNL]
	rdinit=		[KNL]
			Format: <full_path>
			Format: <full_path>
			Run specified binary instead of /init from the ramdisk,
			Run specified binary instead of /init from the ramdisk,
Loading