projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[linux-2.6-microblaze.git]
/
kernel
/
sched
/
cputime.c
diff --git
a/kernel/sched/cputime.c
b/kernel/sched/cputime.c
index
5498f20
..
bac6ac9
100644
(file)
--- a/
kernel/sched/cputime.c
+++ b/
kernel/sched/cputime.c
@@
-259,8
+259,7
@@
static inline u64 account_other_time(u64 max)
{
u64 accounted;
- /* Shall be converted to a lockdep-enabled lightweight check */
- WARN_ON_ONCE(!irqs_disabled());
+ lockdep_assert_irqs_disabled();
accounted = steal_account_process_time(max);