[PATCH] AMD IOMMU: iommu_set_device_table() must not be __init

[PATCH] AMD IOMMU: iommu_set_device_table() must not be __init

[Jan Beulich]

This function is called from enable_iommus(), which in turn is used
from amd_iommu_resume().

Signed-off-by: Jan Beulich <jbeulich-IBi9RG/b67k@public.gmane.org>

---
 drivers/iommu/amd_iommu_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 3.3-rc6/drivers/iommu/amd_iommu_init.c
+++ 3.3-rc6-amd-iommu-sections/drivers/iommu/amd_iommu_init.c
@@ -275,7 +275,7 @@ static void iommu_set_exclusion_range(st
 }
 
 /* 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;

Re: [PATCH] AMD IOMMU: iommu_set_device_table() must not be __init

[Joerg Roedel]

On Thu, Mar 08, 2012 at 08:58:13AM +0000, Jan Beulich wrote:
> This function is called from enable_iommus(), which in turn is used
> from amd_iommu_resume().
> 
> Signed-off-by: Jan Beulich <jbeulich-IBi9RG/b67k@public.gmane.org>
> 
> ---
>  drivers/iommu/amd_iommu_init.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- 3.3-rc6/drivers/iommu/amd_iommu_init.c
> +++ 3.3-rc6-amd-iommu-sections/drivers/iommu/amd_iommu_init.c
> @@ -275,7 +275,7 @@ static void iommu_set_exclusion_range(st
>  }
>  
>  /* 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;

Applied to iommu/fixes, thanks Jan.

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632