diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2009-11-15 21:44:30 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-16 02:58:51 -0500 |
commit | 62ad33f67003b9a7b6013f0511579b9805e11626 (patch) | |
tree | 1104bb92a758f7082d88655e0d7108fb768e0af3 | |
parent | f4131c6259b46bd84dcfcd3bb9ed08e99e2875a4 (diff) |
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>
-rw-r--r-- | 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 80f3ae24b97..d11c5ff7c65 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) { } | |||
20 | void __init x86_init_uint_noop(unsigned int unused) { } | 20 | void __init x86_init_uint_noop(unsigned int unused) { } |
21 | void __init x86_init_pgd_noop(pgd_t *unused) { } | 21 | void __init x86_init_pgd_noop(pgd_t *unused) { } |
22 | int __init iommu_init_noop(void) { return 0; } | 22 | int __init iommu_init_noop(void) { return 0; } |
23 | void __init iommu_shutdown_noop(void) { } | 23 | void iommu_shutdown_noop(void) { } |
24 | 24 | ||
25 | /* | 25 | /* |
26 | * The platform setup functions are preset with the default functions | 26 | * The platform setup functions are preset with the default functions |