[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH v5 07/16] completion: drop init_completion define
Changeset cd8084f91c02 ("locking/lockdep: Apply crossrelease to completions")
added a CONFIG_LOCKDEP_COMPLETE (that was later renamed to

Such changeset renamed the init_completion, and add a macro
that would either run a modified version or the original code.

However, such code reported too many false positives. So, it
ended being dropped later on by
changeset e966eaeeb623 ("locking/lockdep: Remove the cross-release locking checks").

Yet, the define remained there as just:

#define init_completion(x) __init_completion(x)

Get rid of the define, and return __init_completion() function
to its original name.

Fixes: e966eaeeb623 ("locking/lockdep: Remove the cross-release locking checks")
Signed-off-by: Mauro Carvalho Chehab <>
include/linux/completion.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/linux/completion.h b/include/linux/completion.h
index bf8e77001f18..51d9ab079629 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -1,117 +1,116 @@
/* SPDX-License-Identifier: GPL-2.0 */

* (C) Copyright 2001 Linus Torvalds
* Atomic wait-for-completion handler data structures.
* See kernel/sched/completion.c for details.

#include <linux/swait.h>

* struct completion - structure used to maintain state for a "completion"
* This is the opaque structure used to maintain the state for a "completion".
* Completions currently use a FIFO to queue threads that have to wait for
* the "completion" event.
* See also: complete(), wait_for_completion() (and friends _timeout,
* _interruptible, _interruptible_timeout, and _killable), init_completion(),
* reinit_completion(), and macros DECLARE_COMPLETION(),
struct completion {
unsigned int done;
struct swait_queue_head wait;

-#define init_completion_map(x, m) __init_completion(x)
-#define init_completion(x) __init_completion(x)
+#define init_completion_map(x, m) init_completion(x)
static inline void complete_acquire(struct completion *x) {}
static inline void complete_release(struct completion *x) {}

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

(*({ init_completion_map(&(work), &(map)); &(work); }))

(*({ init_completion(&work); &work; }))

* DECLARE_COMPLETION - declare and initialize a completion structure
* @work: identifier for the completion structure
* This macro declares and initializes a completion structure. Generally used
* for static declarations. You should use the _ONSTACK variant for automatic
* variables.
#define DECLARE_COMPLETION(work) \
struct completion work = COMPLETION_INITIALIZER(work)

* Lockdep needs to run a non-constant initializer for on-stack
* completions - so we use the _ONSTACK() variant for those that
* are on the kernel stack:
* DECLARE_COMPLETION_ONSTACK - declare and initialize a completion structure
* @work: identifier for the completion structure
* This macro declares and initializes a completion structure on the kernel
* stack.
struct completion work = COMPLETION_INITIALIZER_ONSTACK(work)
struct completion work = COMPLETION_INITIALIZER_ONSTACK_MAP(work, map)

* init_completion - Initialize a dynamically allocated completion
* @x: pointer to completion structure that is to be initialized
* This inline function will initialize a dynamically created completion
* structure.
-static inline void __init_completion(struct completion *x)
+static inline void init_completion(struct completion *x)
x->done = 0;

* reinit_completion - reinitialize a completion structure
* @x: pointer to completion structure that is to be reinitialized
* This inline function should be used to reinitialize a completion structure so it can
* be reused. This is especially important after complete_all() is used.
static inline void reinit_completion(struct completion *x)
x->done = 0;

extern void wait_for_completion(struct completion *);
extern void wait_for_completion_io(struct completion *);
extern int wait_for_completion_interruptible(struct completion *x);
extern int wait_for_completion_killable(struct completion *x);
extern unsigned long wait_for_completion_timeout(struct completion *x,
unsigned long timeout);
extern unsigned long wait_for_completion_io_timeout(struct completion *x,
unsigned long timeout);
extern long wait_for_completion_interruptible_timeout(
struct completion *x, unsigned long timeout);
extern long wait_for_completion_killable_timeout(
struct completion *x, unsigned long timeout);
extern bool try_wait_for_completion(struct completion *x);
extern bool completion_done(struct completion *x);

 \ /
  Last update: 2020-12-01 13:11    [W:0.358 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site