Merge branches 'gart/fixes', 'amd-iommu/fixes+cleanups' and 'amd-iommu/fault-handling...

diff --cc arch/x86/include/asm/amd_iommu_types.h
Simple merge

diff --cc arch/x86/kernel/amd_iommu.c
index 6c99f5037801302fc60da447ce414a3179fad3eb,009d722af00968948c9696eae59d07ba05da09ea,cfca80bfe75fb0ba1c339bfb9f6a834fe229dcdf..8c93b7c7735e1bacfdd5d55cd689234f52f0ee5c
--- 1/arch/x86/kernel/amd_iommu.c
--- 2/arch/x86/kernel/amd_iommu.c
--- 3/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@@@ -61,11 -59,7 -61,12 +59,8 @@@@ static u64* alloc_pte(struct protection
   static void dma_ops_reserve_addresses(struct dma_ops_domain *dom,
                                      unsigned long start_page,
                                      unsigned int pages);
-  
-  #ifndef BUS_NOTIFY_UNBOUND_DRIVER
-  #define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
-  #endif
++ static void reset_iommu_command_buffer(struct amd_iommu *iommu);
   
  -#ifndef BUS_NOTIFY_UNBOUND_DRIVER
  -#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
  -#endif
  -
   #ifdef CONFIG_AMD_IOMMU_STATS
   
   /*

diff --cc arch/x86/kernel/amd_iommu_init.c
Simple merge