aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-03-08 08:58:13 +0000
committerJoerg Roedel <joerg.roedel@amd.com>2012-03-08 11:36:06 +0100
commit6b7f000eb6a0b81d7a809833edb7a457eedf8512 (patch)
tree75314120f43c82d40ae5627d15a236943d6f846d
parent134d12fae0bb8f3d60dc7440a9e1950bb5427167 (diff)
downloadlinux-stericsson-6b7f000eb6a0b81d7a809833edb7a457eedf8512.tar.gz
x86/amd: iommu_set_device_table() must not be __init
This function is called from enable_iommus(), which in turn is used from amd_iommu_resume(). Cc: stable@vger.kernel.org Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r--drivers/iommu/amd_iommu_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index bdea288dc185..a35e98ad9725 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -275,7 +275,7 @@ static void iommu_set_exclusion_range(struct amd_iommu *iommu)
}
/* Programs the physical address of the device table into the IOMMU hardware */
-static void __init iommu_set_device_table(struct amd_iommu *iommu)
+static void iommu_set_device_table(struct amd_iommu *iommu)
{
u64 entry;