diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:40:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:44:43 +0000 |
commit | b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 (patch) | |
tree | 601c346183757b42c53b1d0aa8773cb00d1bd73c /debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch | |
parent | Merging upstream version 6.7.7. (diff) | |
download | linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.tar.xz linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.zip |
Merging debian version 6.7.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch')
-rw-r--r-- | debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch index 16cac663c1..a4576e75f4 100644 --- a/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch +++ b/debian/patches/features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch @@ -49,8 +49,8 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> depends on BROKEN && X86 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -283,14 +283,14 @@ static LIST_HEAD(dmar_satc_units); - static void device_block_translation(struct device *dev); +@@ -284,14 +284,14 @@ static LIST_HEAD(dmar_satc_units); + static void intel_iommu_domain_free(struct iommu_domain *domain); -int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); @@ -66,7 +66,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk> static int intel_iommu_superpage = 1; static int iommu_identity_mapping; static int iommu_skip_te_disable; -@@ -328,6 +328,7 @@ static int __init intel_iommu_setup(char +@@ -333,6 +333,7 @@ static int __init intel_iommu_setup(char while (*str) { if (!strncmp(str, "on", 2)) { dmar_disabled = 0; |