Merge tag 'iommu-fix-v6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

torvalds · torvalds · commit 11100273f25e · 2024-06-14T10:06:29.000-07:00
Pull iommu fix from Joerg Roedel:
 "A single patch that fixes a regression which several people reported:

   - AMD-Vi: Fix regression causing panics"

* tag 'iommu-fix-v6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix panic accessing amd_iommu_enable_faulting
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
@@ -3362,7 +3362,7 @@ int amd_iommu_reenable(int mode)
 	return 0;
 }
 
-int __init amd_iommu_enable_faulting(unsigned int cpu)
+int amd_iommu_enable_faulting(unsigned int cpu)
 {
 	/* We enable MSI later when PCI is initialized */
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -3362,7 +3362,7 @@ int amd_iommu_reenable(int mode)`
`3362`	`3362`	`return 0;`
`3363`	`3363`	`}`
`3364`	`3364`
`3365`		`-int __init amd_iommu_enable_faulting(unsigned int cpu)`
	`3365`	`+int amd_iommu_enable_faulting(unsigned int cpu)`
`3366`	`3366`	`{`
`3367`	`3367`	`/* We enable MSI later when PCI is initialized */`
`3368`	`3368`	`return 0;`