[tip:core/iommu] x86: Don't put iommu_shutdown_noop() in init section

From: tip-bot for Hiroshi Shimamoto
Date: Mon Nov 16 2009 - 04:04:50 EST


Commit-ID: 62ad33f67003b9a7b6013f0511579b9805e11626
Gitweb: http://git.kernel.org/tip/62ad33f67003b9a7b6013f0511579b9805e11626
Author: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx>
AuthorDate: Mon, 16 Nov 2009 11:44:30 +0900
Committer: Ingo Molnar <mingo@xxxxxxx>
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@xxxxxxxxxxxxx>
Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
LKML-Reference: <4B00BC8E.50801@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/