aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2011-06-07 16:53:39 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2011-06-07 16:53:39 -0400
commit2da8c8bc44b572cbf623629ff736608dc7968436 (patch)
tree90059f6cfcdc25962a433ab986b92e45f6d1bcf1 /kernel
parente197f094b7da7d94812492cfcd706d143f1020e5 (diff)
sched: Remove pointless in_atomic() definition check
It's really supposed to be defined here. If it's not then we actually want the build to crash so that we know it, and not keep it silent. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index fd18f395a1b..01d9536aaa8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8028,7 +8028,6 @@ static inline int preempt_count_equals(int preempt_offset)
8028 8028
8029void __might_sleep(const char *file, int line, int preempt_offset) 8029void __might_sleep(const char *file, int line, int preempt_offset)
8030{ 8030{
8031#ifdef in_atomic
8032 static unsigned long prev_jiffy; /* ratelimiting */ 8031 static unsigned long prev_jiffy; /* ratelimiting */
8033 8032
8034 if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) || 8033 if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) ||
@@ -8050,7 +8049,6 @@ void __might_sleep(const char *file, int line, int preempt_offset)
8050 if (irqs_disabled()) 8049 if (irqs_disabled())
8051 print_irqtrace_events(current); 8050 print_irqtrace_events(current);
8052 dump_stack(); 8051 dump_stack();
8053#endif
8054} 8052}
8055EXPORT_SYMBOL(__might_sleep); 8053EXPORT_SYMBOL(__might_sleep);
8056#endif 8054#endif