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

Commit 194a6b5b authored by Waiman Long's avatar Waiman Long Committed by Ingo Molnar
Browse files

sched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q 



Currently the wake_q data structure is defined by the WAKE_Q() macro.
This macro, however, looks like a function doing something as "wake" is
a verb. Even checkpatch.pl was confused as it reported warnings like

  WARNING: Missing a blank line after declarations
  #548: FILE: kernel/futex.c:3665:
  +	int ret;
  +	WAKE_Q(wake_q);

This patch renames the WAKE_Q() macro to DEFINE_WAKE_Q() which clarifies
what the macro is doing and eliminates the checkpatch.pl warnings.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Acked-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1479401198-1765-1-git-send-email-longman@redhat.com


[ Resolved conflict and added missing rename. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6d0d2878

include/linux/sched.h

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ enum cpu_idle_type { 
 * already in a wake queue, the wakeup will happen soon and the second

 * waker can just skip it.

 *

 * The WAKE_Q macro declares and initializes the list head.

 * The DEFINE_WAKE_Q macro declares and initializes the list head.

 * wake_up_q() does NOT reinitialize the list; it's expected to be

 * called near the end of a function, where the fact that the queue is

 * not used again will be easy to see by inspection.
@@ -1009,7 +1009,7 @@ struct wake_q_head { 


#define WAKE_Q_TAIL ((struct wake_q_node *) 0x01)



#define WAKE_Q(name)					\

#define DEFINE_WAKE_Q(name)				\

	struct wake_q_head name = { WAKE_Q_TAIL, &name.first }



extern void wake_q_add(struct wake_q_head *head,

ipc/mqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, 
	struct timespec ts;

	struct posix_msg_tree_node *new_leaf = NULL;

	int ret = 0;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	if (u_abs_timeout) {

		int res = prepare_timeout(u_abs_timeout, &expires, &ts);
@@ -1151,7 +1151,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, 
			msg_ptr = wait.msg;

		}

	} else {

		WAKE_Q(wake_q);

		DEFINE_WAKE_Q(wake_q);



		msg_ptr = msg_get(info);

ipc/msg.c

+4 −4
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) 
{

	struct msg_msg *msg, *t;

	struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm);

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	expunge_all(msq, -EIDRM, &wake_q);

	ss_wakeup(msq, &wake_q, true);
@@ -397,7 +397,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, 
		goto out_up;

	case IPC_SET:

	{

		WAKE_Q(wake_q);

		DEFINE_WAKE_Q(wake_q);



		if (msqid64.msg_qbytes > ns->msg_ctlmnb &&

		    !capable(CAP_SYS_RESOURCE)) {
@@ -634,7 +634,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, 
	struct msg_msg *msg;

	int err;

	struct ipc_namespace *ns;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	ns = current->nsproxy->ipc_ns;
@@ -850,7 +850,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl 
	struct msg_queue *msq;

	struct ipc_namespace *ns;

	struct msg_msg *msg, *copy = NULL;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	ns = current->nsproxy->ipc_ns;

kernel/futex.c

+4 −4
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this, 
	struct task_struct *new_owner;

	struct futex_pi_state *pi_state = this->pi_state;

	u32 uninitialized_var(curval), newval;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);

	bool deboost;

	int ret = 0;
@@ -1415,7 +1415,7 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) 
	struct futex_q *this, *next;

	union futex_key key = FUTEX_KEY_INIT;

	int ret;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	if (!bitset)

		return -EINVAL;
@@ -1469,7 +1469,7 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, 
	struct futex_hash_bucket *hb1, *hb2;

	struct futex_q *this, *next;

	int ret, op_ret;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



retry:

	ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, VERIFY_READ);
@@ -1708,7 +1708,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, 
	struct futex_pi_state *pi_state = NULL;

	struct futex_hash_bucket *hb1, *hb2;

	struct futex_q *this, *next;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	if (requeue_pi) {

		/*

kernel/locking/mutex.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static noinline void __sched __mutex_unlock_slowpath(struct mutex *lock, unsigne 
{

	struct task_struct *next = NULL;

	unsigned long owner, flags;

	WAKE_Q(wake_q);

	DEFINE_WAKE_Q(wake_q);



	mutex_release(&lock->dep_map, 1, ip);