diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 05:30:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 05:30:40 -0400 |
| commit | 846c791bf7c6b7d9121708a1eb9ca2492b92a858 (patch) | |
| tree | c1097af935782af6cc09f06962abeb3570e26d3c /arch/x86/mm | |
| parent | 354542d034ab2a849a284edcc661e76b753a57dc (diff) | |
| parent | a99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff) | |
Merge tag 'v4.7-rc6' into x86/microcode, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pgtable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 4eb287e25043..aa0ff4b02a96 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #include <asm/fixmap.h> | 6 | #include <asm/fixmap.h> |
| 7 | #include <asm/mtrr.h> | 7 | #include <asm/mtrr.h> |
| 8 | 8 | ||
| 9 | #define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO | 9 | #define PGALLOC_GFP GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO |
| 10 | 10 | ||
| 11 | #ifdef CONFIG_HIGHPTE | 11 | #ifdef CONFIG_HIGHPTE |
| 12 | #define PGALLOC_USER_GFP __GFP_HIGHMEM | 12 | #define PGALLOC_USER_GFP __GFP_HIGHMEM |