From: Joerg Roedel Date: Wed, 28 Oct 2009 17:02:26 +0000 (+0100) Subject: x86/amd-iommu: Un__init function required on shutdown X-Git-Tag: MMI-PSA29.97-13-9~25125^2~85^2^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ca0207114f1708b563f510b7781a360ec5b98359;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- 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;