diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-07-02 04:50:45 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-07-02 04:50:45 -0400 |
| commit | 046e9ceefab985a137fbd15b946497a88e5a6513 (patch) | |
| tree | 29cb2fd3a2783afacc7901f3310bea7a02f84140 /arch/unicore32/include/asm/pgalloc.h | |
| parent | 62db7152c924e4c060e42b34a69cd39658e8a0dc (diff) | |
| parent | 7c5eec4edf4693aa61f3ee78bf28621dfe33d9f0 (diff) | |
Merge tag 'asoc-fix-v4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.7
A small clutch of hardware specific fixes for various ASoC devices, all
small individually and important if you have that device but not
otherwise.
Diffstat (limited to 'arch/unicore32/include/asm/pgalloc.h')
| -rw-r--r-- | arch/unicore32/include/asm/pgalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/include/asm/pgalloc.h b/arch/unicore32/include/asm/pgalloc.h index 2e02d1356fdf..26775793c204 100644 --- a/arch/unicore32/include/asm/pgalloc.h +++ b/arch/unicore32/include/asm/pgalloc.h | |||
| @@ -28,7 +28,7 @@ extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd); | |||
| 28 | #define pgd_alloc(mm) get_pgd_slow(mm) | 28 | #define pgd_alloc(mm) get_pgd_slow(mm) |
| 29 | #define pgd_free(mm, pgd) free_pgd_slow(mm, pgd) | 29 | #define pgd_free(mm, pgd) free_pgd_slow(mm, pgd) |
| 30 | 30 | ||
| 31 | #define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO) | 31 | #define PGALLOC_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) |
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * Allocate one PTE table. | 34 | * Allocate one PTE table. |