Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5346417e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

lockdep: simplify mark_lock() 



remove the state iteration

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 36bfb9bb

kernel/lockdep.c

+7 −12
Original line number Original line Diff line number Diff line
@@ -2626,18 +2626,13 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, 
		return 0;

		return 0;





	switch (new_bit) {

	switch (new_bit) {

	case LOCK_USED_IN_HARDIRQ:

#define LOCKDEP_STATE(__STATE)			\

	case LOCK_USED_IN_SOFTIRQ:

	case LOCK_USED_IN_##__STATE:		\

	case LOCK_USED_IN_HARDIRQ_READ:

	case LOCK_USED_IN_##__STATE##_READ:	\

	case LOCK_USED_IN_SOFTIRQ_READ:

	case LOCK_ENABLED_##__STATE:		\

	case LOCK_ENABLED_HARDIRQ:

	case LOCK_ENABLED_##__STATE##_READ:

	case LOCK_ENABLED_SOFTIRQ:

#include "lockdep_states.h"

	case LOCK_ENABLED_HARDIRQ_READ:

#undef LOCKDEP_STATE

	case LOCK_ENABLED_SOFTIRQ_READ:

	case LOCK_USED_IN_RECLAIM_FS:

	case LOCK_USED_IN_RECLAIM_FS_READ:

	case LOCK_ENABLED_RECLAIM_FS:

	case LOCK_ENABLED_RECLAIM_FS_READ:

		ret = mark_lock_irq(curr, this, new_bit);

		ret = mark_lock_irq(curr, this, new_bit);

		if (!ret)

		if (!ret)

			return 0;

			return 0;