mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
5f34fe1cfc
* 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits) stacktrace: provide save_stack_trace_tsk() weak alias rcu: provide RCU options on non-preempt architectures too printk: fix discarding message when recursion_bug futex: clean up futex_(un)lock_pi fault handling "Tree RCU": scalable classic RCU implementation futex: rename field in futex_q to clarify single waiter semantics x86/swiotlb: add default swiotlb_arch_range_needs_mapping x86/swiotlb: add default phys<->bus conversion x86: unify pci iommu setup and allow swiotlb to compile for 32 bit x86: add swiotlb allocation functions swiotlb: consolidate swiotlb info message printing swiotlb: support bouncing of HighMem pages swiotlb: factor out copy to/from device swiotlb: add arch hook to force mapping swiotlb: allow architectures to override phys<->bus<->phys conversions swiotlb: add comment where we handle the overflow of a dma mask on 32 bit rcu: fix rcutorture behavior during reboot resources: skip sanity check of busy resources swiotlb: move some definitions to header swiotlb: allow architectures to override swiotlb pool allocation ... Fix up trivial conflicts in arch/x86/kernel/Makefile arch/x86/mm/init_32.c include/linux/hardirq.h as per Ingo's suggestions.
14 lines
337 B
C
14 lines
337 B
C
#ifndef _ASM_X86_IOMMU_H
|
|
#define _ASM_X86_IOMMU_H
|
|
|
|
extern void pci_iommu_shutdown(void);
|
|
extern void no_iommu_init(void);
|
|
extern struct dma_mapping_ops nommu_dma_ops;
|
|
extern int force_iommu, no_iommu;
|
|
extern int iommu_detected;
|
|
|
|
/* 10 seconds */
|
|
#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)
|
|
|
|
#endif /* _ASM_X86_IOMMU_H */
|