Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (287638b2) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/scheduler/sched-rt-group.txt

+7 −6

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ The remaining CPU time will be used for user input and other tasks. Because
		realtime tasks have explicitly allocated the CPU time they need to perform
		their tasks, buffer underruns in the graphics or audio can be eliminated.

		NOTE: the above example is not fully implemented as of yet (2.6.25). We still
		NOTE: the above example is not fully implemented yet. We still
		lack an EDF scheduler to make non-uniform periods usable.


		@@ -140,14 +140,15 @@ The other option is:

		.o CONFIG_CGROUP_SCHED (aka "Basis for grouping tasks" = "Control groups")

		This uses the /cgroup virtual file system and "/cgroup/<cgroup>/cpu.rt_runtime_us"
		to control the CPU time reserved for each control group instead.
		This uses the /cgroup virtual file system and
		"/cgroup/<cgroup>/cpu.rt_runtime_us" to control the CPU time reserved for each
		control group instead.

		For more information on working with control groups, you should read
		Documentation/cgroups/cgroups.txt as well.

		Group settings are checked against the following limits in order to keep the configuration
		schedulable:
		Group settings are checked against the following limits in order to keep the
		configuration schedulable:

		\Sum_{i} runtime_{i} / global_period <= global_runtime / global_period

		@@ -189,7 +190,7 @@ Implementing SCHED_EDF might take a while to complete. Priority Inheritance is
		the biggest challenge as the current linux PI infrastructure is geared towards
		the limited static priority levels 0-99. With deadline scheduling you need to
		do deadline inheritance (since priority is inversely proportional to the
		deadline delta (deadline - now).
		deadline delta (deadline - now)).

		This means the whole PI machinery will have to be reworked - and that is one of
		the most complex pieces of code we have.

Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__
		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common \
		-Werror-implicit-function-declaration \
		-Wno-format-security
		-Wno-format-security \
		-fno-delete-null-pointer-checks
		KBUILD_AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)

arch/ia64/include/asm/fpu.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		* David Mosberger-Tang <davidm@hpl.hp.com>
		*/

		#include <linux/types.h>

		/* floating point status register: */
		#define FPSR_TRAP_VD (1 << 0) /* invalid op trap disabled */
		#define FPSR_TRAP_DD (1 << 1) /* denormal trap disabled */

arch/ia64/include/asm/xen/hypervisor.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#ifndef _ASM_IA64_XEN_HYPERVISOR_H
		#define _ASM_IA64_XEN_HYPERVISOR_H

		#include <linux/err.h>
		#include <xen/interface/xen.h>
		#include <xen/interface/version.h> /* to compile feature.c */
		#include <xen/features.h> /* to comiple xen-netfront.c */

arch/ia64/kernel/dma-mapping.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,14 @@ int iommu_detected __read_mostly;
		struct dma_map_ops *dma_ops;
		EXPORT_SYMBOL(dma_ops);

		#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)

		static int __init dma_init(void)
		{
		dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
		}
		fs_initcall(dma_init);

		struct dma_map_ops dma_get_ops(struct device dev)
		{
		return dma_ops;