diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:24:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-06 14:24:21 +0100 |
| commit | 4fda87df09bee2b1bf236aba408c3236d4f1fbca (patch) | |
| tree | f1ec4a5b8696c89141bcdc25b6920b3caf5c9f97 /arch/parisc/include | |
| parent | 70658b99490dd86cfdbf4fca117bbe2ef9a80d03 (diff) | |
| parent | 3b8f4a70b840cff298010481d39404e9c39030d1 (diff) | |
| download | linux-4fda87df09bee2b1bf236aba408c3236d4f1fbca.tar.bz2 | |
Merge tag 'asoc-fix-v4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.0
A few driver specific fixes here, none of them earth shattering in
themselves, that have accumliated since the opening of the merge window.
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/pgtable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index 8c966b2270aa..15207b9362bf 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -96,6 +96,7 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long); #if PT_NLEVELS == 3 #define BITS_PER_PMD (PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY) #else +#define __PAGETABLE_PMD_FOLDED #define BITS_PER_PMD 0 #endif #define PTRS_PER_PMD (1UL << BITS_PER_PMD) |