diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-07-01 14:04:39 +1000 |
| commit | 8b8dc695143642c6a8bee2242f2f7af4232298ab (patch) | |
| tree | c36e89fcf8594e923f14016dc33f12736fd0f5af /arch/powerpc/platforms | |
| parent | 3c25ab35fbc8526ac0c9b298e8a78e7ad7a55479 (diff) | |
| parent | b7cbb5240130520ba572ab1146431ad01d1f5099 (diff) | |
| download | linux-8b8dc695143642c6a8bee2242f2f7af4232298ab.tar.gz linux-8b8dc695143642c6a8bee2242f2f7af4232298ab.tar.bz2 linux-8b8dc695143642c6a8bee2242f2f7af4232298ab.zip | |
Merge branch 'fixes' into next
Merge our fixes branch into next, this brings in a number of commits
that fix bugs we don't want to hit in next, in particular the fix for
CVE-2019-12817.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powermac/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig index f834a19ed772..c02d8c503b29 100644 --- a/arch/powerpc/platforms/powermac/Kconfig +++ b/arch/powerpc/platforms/powermac/Kconfig @@ -7,6 +7,7 @@ config PPC_PMAC select PPC_INDIRECT_PCI if PPC32 select PPC_MPC106 if PPC32 select PPC_NATIVE + select ZONE_DMA if PPC32 default y config PPC_PMAC64 |