diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-14 10:06:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-14 10:06:29 -0700 |
| commit | 11100273f25e326dd12c4534b1aaadb4df59d680 (patch) | |
| tree | 4f0a200d62181785bbeba81033f4f33f5a6e3dfb | |
| parent | 0cac73eb3875f6ecb6105e533218dba1868d04c9 (diff) | |
| parent | 12243a8115f8583a6bcada7717c01fb164e23c89 (diff) | |
Merge tag 'iommu-fix-v6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
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
| -rw-r--r-- | drivers/iommu/amd/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 27e293727095..161248067776 100644 --- 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; |