diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-12-20 17:36:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-20 17:36:04 +0100 |
| commit | 1e9a328e4b35af22c23ce9357c2c2a77159e74bb (patch) | |
| tree | d04364bc2f892e1db6a4ec0edaccfbb782acd243 /arch/sparc/include/asm/pgtable_64.h | |
| parent | ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' an... (diff) | |
| download | linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.tar.xz linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.zip | |
Merge tag 'asoc-fix-v4.15-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.15
This is a fairly large set of fixes, they've been delayed partly as more
and more keep coming in. Most of them are very small driver specific
fixes, the biggest individual thing is the revert of the rcar IOMMU
support - it was causing problems and there wasn't the confidence that
it could be resolved sensibly. There's also a relatively large change
in the Freescale SSI controller which resolves some issues with the
AC'97 mode, these aren't that large in the grand scheme of things and
reflect some fairly thorough review and testing.
Diffstat (limited to 'arch/sparc/include/asm/pgtable_64.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtable_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 5a9e96be1665..9937c5ff94a9 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -715,7 +715,7 @@ static inline unsigned long pmd_pfn(pmd_t pmd) return pte_pfn(pte); } -#define __HAVE_ARCH_PMD_WRITE +#define pmd_write pmd_write static inline unsigned long pmd_write(pmd_t pmd) { pte_t pte = __pte(pmd_val(pmd)); |