From: NeilBrown Date: Sun, 1 Apr 2012 10:19:30 +0000 (+1000) Subject: APM: fix deadlock in APM_IOC_SUSPEND ioctl X-Git-Tag: v3.4-rc2~14^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f283d22713b0bdc147097c92c9b45855339cf1c8;p=pandora-kernel.git APM: fix deadlock in APM_IOC_SUSPEND ioctl I found the Xorg server on my ARM device stuck in the 'msleep()' loop in apm_ioctl. I suspect it had attempted suspend immediately after resuming and lost a race. During that msleep(10);, a new suspend cycle must have started and changed ->suspend_state to SUSPEND_PENDING, so it was never seen to be SUSPEND_DONE and the loop could never exited. It would have moved on to SUSPEND_ACKTO but never been able to reach SUSPEND_DONE. So change the loop to only run while SUSPEND_ACKED rather than until SUSPEND_DONE. This is much safer. Signed-off-by: NeilBrown Signed-off-by: Jiri Kosina --- Reading git-diff-tree failed