summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2011-06-07 22:53:39 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2011-06-07 22:53:39 +0200
commit2da8c8bc44b572cbf623629ff736608dc7968436 (patch)
tree90059f6cfcdc25962a433ab986b92e45f6d1bcf1 /kernel
parentMerge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-2da8c8bc44b572cbf623629ff736608dc7968436.tar.xz
linux-2da8c8bc44b572cbf623629ff736608dc7968436.zip
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 fd18f395a1bf..01d9536aaa8e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8028,7 +8028,6 @@ static inline int preempt_count_equals(int preempt_offset)
void __might_sleep(const char *file, int line, int preempt_offset)
{
-#ifdef in_atomic
static unsigned long prev_jiffy; /* ratelimiting */
if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) ||
@@ -8050,7 +8049,6 @@ void __might_sleep(const char *file, int line, int preempt_offset)
if (irqs_disabled())
print_irqtrace_events(current);
dump_stack();
-#endif
}
EXPORT_SYMBOL(__might_sleep);
#endif