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

Commit 6552ebae authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'core/debugobjects' into core/urgent

parents 749a440b 336f6c32
Loading
Loading
Loading
Loading
+4 −7
Original line number Original line Diff line number Diff line
@@ -3786,14 +3786,11 @@ S: The Netherlands


N: David Woodhouse
N: David Woodhouse
E: dwmw2@infradead.org
E: dwmw2@infradead.org
D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,
D: JFFS2 file system, Memory Technology Device subsystem,
D: some Alpha platform porting from 2.0, Memory Technology Devices,
D: Acquire watchdog timer, PC speaker driver maintenance,
D: various other stuff that annoyed me by not working.
D: various other stuff that annoyed me by not working.
S: c/o Red Hat Engineering
S: c/o Intel Corporation
S: Rustat House
S: Pipers Way
S: 60 Clifton Road
S: Swindon. SN3 1RJ
S: Cambridge. CB1 7EG
S: England
S: England


N: Chris Wright
N: Chris Wright
+4 −5
Original line number Original line Diff line number Diff line
@@ -170,16 +170,15 @@ Returns: 0 if successful and a negative error if not.
u64
u64
dma_get_required_mask(struct device *dev)
dma_get_required_mask(struct device *dev)


After setting the mask with dma_set_mask(), this API returns the
This API returns the mask that the platform requires to
actual mask (within that already set) that the platform actually
operate efficiently.  Usually this means the returned mask
requires to operate efficiently.  Usually this means the returned mask
is the minimum required to cover all of memory.  Examining the
is the minimum required to cover all of memory.  Examining the
required mask gives drivers with variable descriptor sizes the
required mask gives drivers with variable descriptor sizes the
opportunity to use smaller descriptors as necessary.
opportunity to use smaller descriptors as necessary.


Requesting the required mask does not alter the current mask.  If you
Requesting the required mask does not alter the current mask.  If you
wish to take advantage of it, you should issue another dma_set_mask()
wish to take advantage of it, you should issue a dma_set_mask()
call to lower the mask again.
call to set the mask to the value returned.




Part Id - Streaming DMA mappings
Part Id - Streaming DMA mappings
+4 −0
Original line number Original line Diff line number Diff line
@@ -392,6 +392,10 @@ int main(int argc, char *argv[])
			goto err;
			goto err;
		}
		}
	}
	}
	if (!maskset && !tid && !containerset) {
		usage();
		goto err;
	}


	do {
	do {
		int i;
		int i;
+3 −2
Original line number Original line Diff line number Diff line
				CGROUPS
				CGROUPS
				-------
				-------


Written by Paul Menage <menage@google.com> based on Documentation/cpusets.txt
Written by Paul Menage <menage@google.com> based on
Documentation/cgroups/cpusets.txt


Original copyright statements from cpusets.txt:
Original copyright statements from cpusets.txt:
Portions Copyright (C) 2004 BULL SA.
Portions Copyright (C) 2004 BULL SA.
@@ -68,7 +69,7 @@ On their own, the only use for cgroups is for simple job
tracking. The intention is that other subsystems hook into the generic
tracking. The intention is that other subsystems hook into the generic
cgroup support to provide new attributes for cgroups, such as
cgroup support to provide new attributes for cgroups, such as
accounting/limiting the resources which processes in a cgroup can
accounting/limiting the resources which processes in a cgroup can
access. For example, cpusets (see Documentation/cpusets.txt) allows
access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allows
you to associate a set of CPUs and a set of memory nodes with the
you to associate a set of CPUs and a set of memory nodes with the
tasks in each cgroup.
tasks in each cgroup.


Loading