diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 05:58:30 -0400 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /arch/s390/include/asm/pgtable.h | |
| parent | 8dd0eb3566711d81bfbe2b4421b33f0dd723cec4 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'arch/s390/include/asm/pgtable.h')
| -rw-r--r-- | arch/s390/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index fbb5ee3ae57c..e08ec38f8c6e 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h | |||
| @@ -91,7 +91,9 @@ extern unsigned long zero_page_mask; | |||
| 91 | */ | 91 | */ |
| 92 | #define PTRS_PER_PTE 256 | 92 | #define PTRS_PER_PTE 256 |
| 93 | #ifndef CONFIG_64BIT | 93 | #ifndef CONFIG_64BIT |
| 94 | #define __PAGETABLE_PUD_FOLDED | ||
| 94 | #define PTRS_PER_PMD 1 | 95 | #define PTRS_PER_PMD 1 |
| 96 | #define __PAGETABLE_PMD_FOLDED | ||
| 95 | #define PTRS_PER_PUD 1 | 97 | #define PTRS_PER_PUD 1 |
| 96 | #else /* CONFIG_64BIT */ | 98 | #else /* CONFIG_64BIT */ |
| 97 | #define PTRS_PER_PMD 2048 | 99 | #define PTRS_PER_PMD 2048 |