From: Scott Jiang <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit aefefe92116b776203f95f3249ae61b94f73f170 upstream. We shouldn't sleep in atomic sections. Signed-off-by: Scott Jiang <[email protected]> Cc: Oliver Neukum <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- arch/blackfin/mach-common/pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 87bfe549ad3f..92273fa6804a 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c @@ -144,7 +144,7 @@ int bfin_pm_suspend_mem_enter(void) unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH + L1_DATA_B_LENGTH + L1_SCRATCH_LENGTH, - GFP_KERNEL); + GFP_ATOMIC); if (memptr == NULL) { panic("bf53x_suspend_l1_mem malloc failed"); -- 2.7.0
