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 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
fork.c
diff --git
a/kernel/fork.c
b/kernel/fork.c
index 16fd412c756d708c244545b4a264f1891840f764..4bd2f516401f5409c76772a314e014c1357c47f7 100644
(file)
--- a/
kernel/fork.c
+++ b/
kernel/fork.c
@@
-910,7
+910,7
@@
static struct task_struct *copy_process(unsigned long clone_flags,
rt_mutex_init_task(p);
-#if
defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_LOCKDEP)
+#if
def CONFIG_PROVE_LOCKING
DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
#endif