diff --git a/config-armv7-generic b/config-armv7-generic
index 136c50b2b..1fcaa9662 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -247,7 +247,7 @@ CONFIG_EXYNOS_ADC=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW_EXYNOS=m
-CONFIG_EXYNOS_IOMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
 CONFIG_PCI_EXYNOS=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_SAMSUNG_USB2=m
@@ -283,7 +283,7 @@ CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_IOMMU=y
+# CONFIG_DRM_EXYNOS_IOMMU is not set
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
diff --git a/kernel.spec b/kernel.spec
index 6ba055f02..b0f14db47 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2045,6 +2045,7 @@ fi
 %changelog
 * Wed Nov 11 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - Linux v4.3
+- Disable Exynos IOMMU as it crashes
 - Enable some IIO sensors (temp/humidity) on ARMv7
 - Move iscsi_tcp and related modules to kernel-core (rhbz 1249424)
 - CVE-2015-7799 slip:crash when using PPP char dev driver (rhbz 1271134 1271135)