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

Commit 8875408a authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

sgi-xp: nested calls to spin_lock_irqsave() 



The code here has a nested spin_lock_irqsave().  It's not needed since
IRQs are already disabled and it causes a problem because it means that
IRQs won't be enabled again at the end.  The second call to
spin_lock_irqsave() will overwrite the value of irq_flags and we can't
restore the proper settings.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Cc: Jack Steiner <steiner@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fea9f718

drivers/misc/sgi-xp/xpc_uv.c

+2 −2
Original line number Diff line number Diff line
@@ -452,9 +452,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part, 


		if (msg->activate_gru_mq_desc_gpa !=

		    part_uv->activate_gru_mq_desc_gpa) {

			spin_lock_irqsave(&part_uv->flags_lock, irq_flags);

			spin_lock(&part_uv->flags_lock);

			part_uv->flags &= ~XPC_P_CACHED_ACTIVATE_GRU_MQ_DESC_UV;

			spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);

			spin_unlock(&part_uv->flags_lock);

			part_uv->activate_gru_mq_desc_gpa =

			    msg->activate_gru_mq_desc_gpa;

		}