projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sched
/
core.c
diff --git
a/kernel/sched/core.c
b/kernel/sched/core.c
index d2bd4647586ceeddcd08fff2f5cc417d42185d65..503d6426126d0af026995ff45b8508155dc9c743 100644
(file)
--- a/
kernel/sched/core.c
+++ b/
kernel/sched/core.c
@@
-71,6
+71,7
@@
#include <linux/ftrace.h>
#include <linux/slab.h>
#include <linux/init_task.h>
#include <linux/ftrace.h>
#include <linux/slab.h>
#include <linux/init_task.h>
+#include <linux/binfmts.h>
#include <asm/tlb.h>
#include <asm/irq_regs.h>
#include <asm/tlb.h>
#include <asm/irq_regs.h>
@@
-7571,8
+7572,7
@@
static inline struct task_group *cgroup_tg(struct cgroup *cgrp)
struct task_group, css);
}
struct task_group, css);
}
-static struct cgroup_subsys_state *
-cpu_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cgrp)
+static struct cgroup_subsys_state *cpu_cgroup_create(struct cgroup *cgrp)
{
struct task_group *tg, *parent;
{
struct task_group *tg, *parent;
@@
-7589,15
+7589,14
@@
cpu_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cgrp)
return &tg->css;
}
return &tg->css;
}
-static void
-cpu_cgroup_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
+static void cpu_cgroup_destroy(struct cgroup *cgrp)
{
struct task_group *tg = cgroup_tg(cgrp);
sched_destroy_group(tg);
}
{
struct task_group *tg = cgroup_tg(cgrp);
sched_destroy_group(tg);
}
-static int cpu_cgroup_can_attach(struct cgroup
_subsys *ss, struct cgroup
*cgrp,
+static int cpu_cgroup_can_attach(struct cgroup *cgrp,
struct cgroup_taskset *tset)
{
struct task_struct *task;
struct cgroup_taskset *tset)
{
struct task_struct *task;
@@
-7615,7
+7614,7
@@
static int cpu_cgroup_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
return 0;
}
return 0;
}
-static void cpu_cgroup_attach(struct cgroup
_subsys *ss, struct cgroup
*cgrp,
+static void cpu_cgroup_attach(struct cgroup *cgrp,
struct cgroup_taskset *tset)
{
struct task_struct *task;
struct cgroup_taskset *tset)
{
struct task_struct *task;
@@
-7625,8
+7624,8
@@
static void cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
}
static void
}
static void
-cpu_cgroup_exit(struct cgroup
_subsys *ss, struct cgroup *
cgrp,
- struct
cgroup *old_cgrp, struct
task_struct *task)
+cpu_cgroup_exit(struct cgroup
*cgrp, struct cgroup *old_
cgrp,
+ struct task_struct *task)
{
/*
* cgroup_exit() is called in the copy_process() failure path.
{
/*
* cgroup_exit() is called in the copy_process() failure path.
@@
-7976,8
+7975,7
@@
struct cgroup_subsys cpu_cgroup_subsys = {
*/
/* create a new cpu accounting group */
*/
/* create a new cpu accounting group */
-static struct cgroup_subsys_state *cpuacct_create(
- struct cgroup_subsys *ss, struct cgroup *cgrp)
+static struct cgroup_subsys_state *cpuacct_create(struct cgroup *cgrp)
{
struct cpuacct *ca;
{
struct cpuacct *ca;
@@
-8007,8
+8005,7
@@
out:
}
/* destroy an existing cpu accounting group */
}
/* destroy an existing cpu accounting group */
-static void
-cpuacct_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
+static void cpuacct_destroy(struct cgroup *cgrp)
{
struct cpuacct *ca = cgroup_ca(cgrp);
{
struct cpuacct *ca = cgroup_ca(cgrp);