diff options
author | Jonathan Corbet <corbet@lwn.net> | 2011-04-22 13:19:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-24 07:18:38 -0400 |
commit | 625f2a378e5a10f45fdc37932fc9f8a21676de9e (patch) | |
tree | 1bf966a8e65463cdcc313c559533f032657c9dcf /include/linux/sched.h | |
parent | d3bf52e998056a6002b2aecfe1d25486376382ac (diff) |
sched: Get rid of lock_depth
Neil Brown pointed out that lock_depth somehow escaped the BKL
removal work. Let's get rid of it now.
Note that the perf scripting utilities still have a bunch of
code for dealing with common_lock_depth in tracepoints; I have
left that in place in case anybody wants to use that code with
older kernels.
Suggested-by: Neil Brown <neilb@suse.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20110422111910.456c0e84@bike.lwn.net
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 171ba24b08a..013314a5610 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -731,10 +731,6 @@ struct sched_info { | |||
731 | /* timestamps */ | 731 | /* timestamps */ |
732 | unsigned long long last_arrival,/* when we last ran on a cpu */ | 732 | unsigned long long last_arrival,/* when we last ran on a cpu */ |
733 | last_queued; /* when we were last queued to run */ | 733 | last_queued; /* when we were last queued to run */ |
734 | #ifdef CONFIG_SCHEDSTATS | ||
735 | /* BKL stats */ | ||
736 | unsigned int bkl_count; | ||
737 | #endif | ||
738 | }; | 734 | }; |
739 | #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */ | 735 | #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */ |
740 | 736 | ||
@@ -1190,8 +1186,6 @@ struct task_struct { | |||
1190 | unsigned int flags; /* per process flags, defined below */ | 1186 | unsigned int flags; /* per process flags, defined below */ |
1191 | unsigned int ptrace; | 1187 | unsigned int ptrace; |
1192 | 1188 | ||
1193 | int lock_depth; /* BKL lock depth */ | ||
1194 | |||
1195 | #ifdef CONFIG_SMP | 1189 | #ifdef CONFIG_SMP |
1196 | struct task_struct *wake_entry; | 1190 | struct task_struct *wake_entry; |
1197 | int on_cpu; | 1191 | int on_cpu; |