projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mm: introduce CONFIG_MEMCG_KMEM as combination of CONFIG_MEMCG && !CONFIG_SLOB
[linux-block.git]
/
include
/
linux
/
sched.h
diff --git
a/include/linux/sched.h
b/include/linux/sched.h
index 1827f4a7a6de07501313dd12233c31e06792f638..789923fbee3a8a8dc849c92a08ce37893e175b31 100644
(file)
--- a/
include/linux/sched.h
+++ b/
include/linux/sched.h
@@
-722,8
+722,8
@@
struct task_struct {
unsigned restore_sigmask:1;
#endif
#ifdef CONFIG_MEMCG
- unsigned
memcg_may_oom
:1;
-#if
ndef CONFIG_SLOB
+ unsigned
in_user_fault
:1;
+#if
def CONFIG_MEMCG_KMEM
unsigned memcg_kmem_skip_account:1;
#endif
#endif