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

Commit 7c6c6636 authored by Robin Holt's avatar Robin Holt Committed by Tony Luck
Browse files

[IA64-SGI] Fix XPC code which sleeps with spin_lock_irqsave(). 



During some testing, we got a warning about trying to allocate
memory while holding a lock.  This fixes that problem.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Acked-by: default avatarDean Nelson <dcn@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 9a52bbed

arch/ia64/sn/kernel/xpc_main.c

+11 −8
Original line number Diff line number Diff line
@@ -575,18 +575,21 @@ xpc_activate_partition(struct xpc_partition *part) 


	spin_lock_irqsave(&part->act_lock, irq_flags);



	pid = kernel_thread(xpc_activating, (void *) ((u64) partid), 0);



	DBUG_ON(part->act_state != XPC_P_INACTIVE);



	if (pid > 0) {

	part->act_state = XPC_P_ACTIVATION_REQ;

	XPC_SET_REASON(part, xpcCloneKThread, __LINE__);

	} else {

		XPC_SET_REASON(part, xpcCloneKThreadFailed, __LINE__);

	}



	spin_unlock_irqrestore(&part->act_lock, irq_flags);



	pid = kernel_thread(xpc_activating, (void *) ((u64) partid), 0);



	if (unlikely(pid <= 0)) {

		spin_lock_irqsave(&part->act_lock, irq_flags);

		part->act_state = XPC_P_INACTIVE;

		XPC_SET_REASON(part, xpcCloneKThreadFailed, __LINE__);

		spin_unlock_irqrestore(&part->act_lock, irq_flags);

	}

}