summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-03-08 08:58:13 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-12 12:31:41 -0700
commita5a2f494f9eff644c5369807a472cc6d9722baed (patch)
tree71a78d7bbca108ed528a21ef5d28a27be70c6181 /drivers/iommu
parent5df11c989c126568ce9d383ec1898bfeb8548ed4 (diff)
downloadkernel-common-a5a2f494f9eff644c5369807a472cc6d9722baed.tar.gz
kernel-common-a5a2f494f9eff644c5369807a472cc6d9722baed.tar.bz2
kernel-common-a5a2f494f9eff644c5369807a472cc6d9722baed.zip
x86/amd: iommu_set_device_table() must not be __init
commit 6b7f000eb6a0b81d7a809833edb7a457eedf8512 upstream. This function is called from enable_iommus(), which in turn is used from amd_iommu_resume(). Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iommu')
-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 82d2410f4205..5c741795a0c3 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -268,7 +268,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;