Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a15564 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

x86: Move iommu_shutdown_noop to x86_init.c 



iommu_init_noop() is in arch/x86/kernel/x86_init.c but
iommu_shutdown_noop() in arch/x86/include/asm/iommu.h.

This moves iommu_shutdown_noop() to x86_init.c for consistency.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
LKML-Reference: <1258199198-16657-3-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a3b28ee1

arch/x86/include/asm/iommu.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_IOMMU_H

#define _ASM_X86_IOMMU_H



static inline void iommu_shutdown_noop(void) {}

extern struct dma_map_ops nommu_dma_ops;

extern int force_iommu, no_iommu;

extern int iommu_detected;

arch/x86/kernel/x86_init.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +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) { }



/*

 * The platform setup functions are preset with the default functions