Messages in this thread Patch in this message | | | Date | Mon, 16 Nov 2009 09:03:46 GMT | From | tip-bot for Hiroshi Shimamoto <> | Subject | [tip:core/iommu] x86: Don't put iommu_shutdown_noop() in init section |
| |
Commit-ID: 62ad33f67003b9a7b6013f0511579b9805e11626 Gitweb: http://git.kernel.org/tip/62ad33f67003b9a7b6013f0511579b9805e11626 Author: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> AuthorDate: Mon, 16 Nov 2009 11:44:30 +0900 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 16 Nov 2009 08:58:51 +0100
x86: Don't put iommu_shutdown_noop() in init section
It causes kernel panic on shutdown or reboot.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> LKML-Reference: <4B00BC8E.50801@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/x86_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index 80f3ae2..d11c5ff 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -20,7 +20,7 @@ void __cpuinit x86_init_noop(void) { } void __init x86_init_uint_noop(unsigned int unused) { } void __init x86_init_pgd_noop(pgd_t *unused) { } int __init iommu_init_noop(void) { return 0; } -void __init iommu_shutdown_noop(void) { } +void iommu_shutdown_noop(void) { } /* * The platform setup functions are preset with the default functions
| |