Skip to content

Commit

Permalink
posix-timers: Convert abuses of BUG_ON to WARN_ON
Browse files Browse the repository at this point in the history
The posix cpu timers code makes a heavy use of BUG_ON()
but none of these concern fatal issues that require
to stop the machine. So let's just warn the user when
some internal state slips out of our hands.

Signed-off-by: Frederic Weisbecker <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Kosaki Motohiro <[email protected]>
Cc: Andrew Morton <[email protected]>
  • Loading branch information
fweisbec committed Dec 9, 2013
1 parent e73d84e commit 531f64f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions kernel/posix-cpu-timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ static int posix_cpu_timer_del(struct k_itimer *timer)
* We raced with the reaping of the task.
* The deletion should have cleared us off the list.
*/
BUG_ON(!list_empty(&timer->it.cpu.entry));
WARN_ON_ONCE(!list_empty(&timer->it.cpu.entry));
} else {
if (timer->it.cpu.firing)
ret = TIMER_RETRY;
Expand Down Expand Up @@ -640,7 +640,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
/*
* Disarm any old timer after extracting its expiry time.
*/
BUG_ON(!irqs_disabled());
WARN_ON_ONCE(!irqs_disabled());

ret = 0;
old_incr = timer->it.cpu.incr;
Expand Down Expand Up @@ -1061,7 +1061,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
/*
* Now re-arm for the new expiry time.
*/
BUG_ON(!irqs_disabled());
WARN_ON_ONCE(!irqs_disabled());
arm_timer(timer);
unlock_task_sighand(p, &flags);

Expand Down Expand Up @@ -1150,7 +1150,7 @@ void run_posix_cpu_timers(struct task_struct *tsk)
struct k_itimer *timer, *next;
unsigned long flags;

BUG_ON(!irqs_disabled());
WARN_ON_ONCE(!irqs_disabled());

/*
* The fast path checks that there are no expired thread or thread
Expand Down Expand Up @@ -1217,7 +1217,7 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
{
unsigned long long now;

BUG_ON(clock_idx == CPUCLOCK_SCHED);
WARN_ON_ONCE(clock_idx == CPUCLOCK_SCHED);
cpu_timer_sample_group(clock_idx, tsk, &now);

if (oldval) {
Expand Down

0 comments on commit 531f64f

Please sign in to comment.