diff options
| author | Scott Jiang <scott.jiang.linux@gmail.com> | 2013-09-16 00:53:09 -0400 |
|---|---|---|
| committer | Steven Miao <realmz6@gmail.com> | 2013-11-15 05:14:42 -0500 |
| commit | aefefe92116b776203f95f3249ae61b94f73f170 (patch) | |
| tree | ec31feb799438f08275015be29d36cfca5da2ce0 /arch/blackfin | |
| parent | eb06c06494c4fc5f493074cb082081a17a2d7a45 (diff) | |
pm: use GFP_ATOMIC when pm core call this function
We shouldn't sleep in atomic sections.
Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Diffstat (limited to 'arch/blackfin')
| -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 675ffb148fbc..4319568029fb 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
| @@ -145,7 +145,7 @@ int bfin_pm_suspend_mem_enter(void) | |||
| 145 | 145 | ||
| 146 | unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH | 146 | unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH |
| 147 | + L1_DATA_B_LENGTH + L1_SCRATCH_LENGTH, | 147 | + L1_DATA_B_LENGTH + L1_SCRATCH_LENGTH, |
| 148 | GFP_KERNEL); | 148 | GFP_ATOMIC); |
| 149 | 149 | ||
| 150 | if (memptr == NULL) { | 150 | if (memptr == NULL) { |
| 151 | panic("bf53x_suspend_l1_mem malloc failed"); | 151 | panic("bf53x_suspend_l1_mem malloc failed"); |