From: Daniel J Blueman Date: Wed, 18 May 2011 23:31:31 +0000 (-0700) Subject: x86, ioapic: Fix potential resume deadlock X-Git-Tag: v2.6.39.1~90 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f76923c73aad9b726825e70d07f49a572938dc80;p=pandora-kernel.git x86, ioapic: Fix potential resume deadlock commit b64ce24daffb634b5b3133a2e411bd4de50654e8 upstream. Fix a potential deadlock when resuming; here the calling function has disabled interrupts, so we cannot sleep. Change the memory allocation flag from GFP_KERNEL to GFP_ATOMIC. TODO: We can do away with this memory allocation during resume by reusing the ioapic suspend/resume code that uses boot time allocated buffers, but we want to keep this -stable patch simple. Signed-off-by: Daniel J Blueman Signed-off-by: Suresh Siddha Link: http://lkml.kernel.org/r/20110518233157.385970138@sbsiddha-MOBL3.sc.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed