diff options
| author | Scott Jiang <scott.jiang.linux@gmail.com> | 2013-09-16 00:53:09 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-19 16:53:34 +0100 |
| commit | ae36e1e259f167bb60a22e0fd3e76749e28c0614 (patch) | |
| tree | 2fff8339417ce135570e811a7f58f876f46c9d90 /arch | |
| parent | 39c9944afb08c26ff36ae1967497d44fcf5a87ed (diff) | |
| download | lwn-ae36e1e259f167bb60a22e0fd3e76749e28c0614.tar.gz lwn-ae36e1e259f167bb60a22e0fd3e76749e28c0614.zip | |
pm: use GFP_ATOMIC when pm core call this function
commit aefefe92116b776203f95f3249ae61b94f73f170 upstream.
We shouldn't sleep in atomic sections.
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Cc: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/mach-common/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |