From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 3 Sep 2009 14:32:00 +0000 (+0200)
Subject: Merge branches 'gart/fixes', 'amd-iommu/fixes+cleanups' and 'amd-iommu/fault-handling... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85da07c409daba3d067824f0051d58f70cb571a0;p=mv-sheeva.git

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

85da07c409daba3d067824f0051d58f70cb571a0
diff --cc arch/x86/kernel/amd_iommu.c
index 6c99f503780,009d722af00,cfca80bfe75..8c93b7c7735
--- a/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
   
   /*