summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-10-28 18:02:26 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2009-10-28 18:02:26 +0100
commitca0207114f1708b563f510b7781a360ec5b98359 (patch)
tree4805249debe3a611dc649f4c71e95ac6c7d58b51 /arch/x86
parentc5cca146aa03e1f60fb179df65f0dbaf17bc64ed (diff)
downloadblackbird-op-linux-ca0207114f1708b563f510b7781a360ec5b98359.tar.gz
blackbird-op-linux-ca0207114f1708b563f510b7781a360ec5b98359.zip
x86/amd-iommu: Un__init function required on shutdown
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c2
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;
OpenPOWER on IntegriCloud