diff options
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 55f5ee7cc3d3..8db31ef98d2f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1364,6 +1364,10 @@ struct task_struct { | |||
1364 | unsigned sched_reset_on_fork:1; | 1364 | unsigned sched_reset_on_fork:1; |
1365 | unsigned sched_contributes_to_load:1; | 1365 | unsigned sched_contributes_to_load:1; |
1366 | 1366 | ||
1367 | #ifdef CONFIG_MEMCG_KMEM | ||
1368 | unsigned memcg_kmem_skip_account:1; | ||
1369 | #endif | ||
1370 | |||
1367 | unsigned long atomic_flags; /* Flags needing atomic access. */ | 1371 | unsigned long atomic_flags; /* Flags needing atomic access. */ |
1368 | 1372 | ||
1369 | pid_t pid; | 1373 | pid_t pid; |
@@ -1679,8 +1683,7 @@ struct task_struct { | |||
1679 | /* bitmask and counter of trace recursion */ | 1683 | /* bitmask and counter of trace recursion */ |
1680 | unsigned long trace_recursion; | 1684 | unsigned long trace_recursion; |
1681 | #endif /* CONFIG_TRACING */ | 1685 | #endif /* CONFIG_TRACING */ |
1682 | #ifdef CONFIG_MEMCG /* memcg uses this to do batch job */ | 1686 | #ifdef CONFIG_MEMCG |
1683 | unsigned int memcg_kmem_skip_account; | ||
1684 | struct memcg_oom_info { | 1687 | struct memcg_oom_info { |
1685 | struct mem_cgroup *memcg; | 1688 | struct mem_cgroup *memcg; |
1686 | gfp_t gfp_mask; | 1689 | gfp_t gfp_mask; |
@@ -2482,6 +2485,10 @@ extern void do_group_exit(int); | |||
2482 | extern int do_execve(struct filename *, | 2485 | extern int do_execve(struct filename *, |
2483 | const char __user * const __user *, | 2486 | const char __user * const __user *, |
2484 | const char __user * const __user *); | 2487 | const char __user * const __user *); |
2488 | extern int do_execveat(int, struct filename *, | ||
2489 | const char __user * const __user *, | ||
2490 | const char __user * const __user *, | ||
2491 | int); | ||
2485 | extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *); | 2492 | extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *); |
2486 | struct task_struct *fork_idle(int); | 2493 | struct task_struct *fork_idle(int); |
2487 | extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); | 2494 | extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); |