diff options
| author | Dan Horák <dan@danny.cz> | 2017-08-11 12:25:33 +0200 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2017-08-11 08:56:58 -0400 |
| commit | 2511dad1960299ad6c9ab3fba04435779917484d (patch) | |
| tree | 147f5f92d6bffcd749d8b8358e5673a7e1b3d9c2 | |
| parent | 62b80a4038987b958deebdec284c9cd4986ace7e (diff) | |
| download | kernel-2511dad1960299ad6c9ab3fba04435779917484d.tar.gz kernel-2511dad1960299ad6c9ab3fba04435779917484d.tar.xz kernel-2511dad1960299ad6c9ab3fba04435779917484d.zip | |
disable SWIOTLB on Power (#1480380)
All supported platforms have IOMMU, thus disable.
| -rw-r--r-- | baseconfig/powerpc/CONFIG_SWIOTLB | 2 | ||||
| -rw-r--r-- | kernel-ppc64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64p7.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
8 files changed, 10 insertions, 7 deletions
diff --git a/baseconfig/powerpc/CONFIG_SWIOTLB b/baseconfig/powerpc/CONFIG_SWIOTLB index 5405b65b4..ac62bf35e 100644 --- a/baseconfig/powerpc/CONFIG_SWIOTLB +++ b/baseconfig/powerpc/CONFIG_SWIOTLB @@ -1 +1 @@ -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index d80495c4b..a8c70bd25 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -4896,7 +4896,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 1dcddf1db..4ed57e633 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -4872,7 +4872,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 4eaa46bb7..61c4a2a41 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4825,7 +4825,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index dbff9c86e..331a336d9 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4801,7 +4801,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 32a7a7e94..30089e5d1 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -4824,7 +4824,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index d822da858..74dd73106 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -4800,7 +4800,7 @@ CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y CONFIG_SWAP=y -CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB is not set # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set CONFIG_SYNC_FILE=y diff --git a/kernel.spec b/kernel.spec index 23e210916..286c19f98 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2254,6 +2254,9 @@ fi # # %changelog +* Fri Aug 11 2017 Dan Horak <dan@danny.cz> +- disable SWIOTLB on Power (#1480380) + * Fri Aug 11 2017 Josh Boyer <jwboyer@fedoraproject.org> - Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380) |