projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5cca14
)
x86/amd-iommu: Un__init function required on shutdown
author
Joerg Roedel
<joerg.roedel@amd.com>
Wed, 28 Oct 2009 17:02:26 +0000
(18:02 +0100)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Wed, 28 Oct 2009 17:02:26 +0000
(18:02 +0100)
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>
arch/x86/kernel/amd_iommu_init.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/amd_iommu_init.c
b/arch/x86/kernel/amd_iommu_init.c
index
498c8c7
..
1e423b2
100644
(file)
--- 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;