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

Commit 527187d2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

locking/lockdep: Remove cross-release leftovers 



There's two cross-release leftover facilities:

 - the crossrelease_hist_*() irq-tracing callbacks (NOPs currently)
 - the complete_release_commit() callback (NOP as well)

Remove them.

Cc: David Sterba <dsterba@suse.com>
Cc: Byungchul Park <byungchul.park@lge.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dba04eb7

include/linux/completion.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct completion { 
#define init_completion(x) __init_completion(x)

static inline void complete_acquire(struct completion *x) {}

static inline void complete_release(struct completion *x) {}

static inline void complete_release_commit(struct completion *x) {}



#define COMPLETION_INITIALIZER(work) \

	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }

include/linux/irqflags.h

+0 −4
Original line number Diff line number Diff line
@@ -27,22 +27,18 @@ 
# define trace_hardirq_enter()			\

do {						\

	current->hardirq_context++;		\

	crossrelease_hist_start(XHLOCK_HARD);	\

} while (0)

# define trace_hardirq_exit()			\

do {						\

	current->hardirq_context--;		\

	crossrelease_hist_end(XHLOCK_HARD);	\

} while (0)

# define lockdep_softirq_enter()		\

do {						\

	current->softirq_context++;		\

	crossrelease_hist_start(XHLOCK_SOFT);	\

} while (0)

# define lockdep_softirq_exit()			\

do {						\

	current->softirq_context--;		\

	crossrelease_hist_end(XHLOCK_SOFT);	\

} while (0)

# define INIT_TRACE_IRQFLAGS	.softirqs_enabled = 1,

#else

include/linux/lockdep.h

+0 −2
Original line number Diff line number Diff line
@@ -475,8 +475,6 @@ enum xhlock_context_t { 
#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \

	{ .name = (_name), .key = (void *)(_key), }



static inline void crossrelease_hist_start(enum xhlock_context_t c) {}

static inline void crossrelease_hist_end(enum xhlock_context_t c) {}

static inline void lockdep_invariant_state(bool force) {}

static inline void lockdep_init_task(struct task_struct *task) {}

static inline void lockdep_free_task(struct task_struct *task) {}

kernel/sched/completion.c

+0 −5
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ void complete(struct completion *x) 


	spin_lock_irqsave(&x->wait.lock, flags);



	/*

	 * Perform commit of crossrelease here.

	 */

	complete_release_commit(x);



	if (x->done != UINT_MAX)

		x->done++;

	__wake_up_locked(&x->wait, TASK_NORMAL, 1);