diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-10-28 18:02:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-09 16:23:10 -0800 |
| commit | 77608cc64e305111725bbefe7d238d9f6da38c5d (patch) | |
| tree | 68bbe8b4483710b653eec036e157a6bb7b9ec9ba /arch | |
| parent | de59170f391ea08e7ebb1e85e687a5df96985fcb (diff) | |
| download | linux-stable-77608cc64e305111725bbefe7d238d9f6da38c5d.tar.gz linux-stable-77608cc64e305111725bbefe7d238d9f6da38c5d.tar.bz2 linux-stable-77608cc64e305111725bbefe7d238d9f6da38c5d.zip | |
x86/amd-iommu: Un__init function required on shutdown
commit ca0207114f1708b563f510b7781a360ec5b98359 upstream.
The function iommu_feature_disable is required on system
shutdown to disable the IOMMU but it is marked as __init.
This may result in a panic if the memory is reused. This
patch fixes this bug.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 498c8c79aaa5..1e423b2add15 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -240,7 +240,7 @@ static void iommu_feature_enable(struct amd_iommu *iommu, u8 bit) writel(ctrl, iommu->mmio_base + MMIO_CONTROL_OFFSET); } -static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit) +static void iommu_feature_disable(struct amd_iommu *iommu, u8 bit) { u32 ctrl; |