patch-2.4.26 linux-2.4.26/arch/x86_64/kernel/aperture.c

• Lines: 27
• Date: 2004-04-14 06:05:28.000000000 -0700
• Orig file: linux-2.4.25/arch/x86_64/kernel/aperture.c
• Orig date: 2003-08-25 04:44:40.000000000 -0700

diff -urN linux-2.4.25/arch/x86_64/kernel/aperture.c linux-2.4.26/arch/x86_64/kernel/aperture.c
@@ -8,7 +8,7 @@
  * because only the bootmem allocator can allocate 32+MB. 
  * 
  * Copyright 2002 Andi Kleen, SuSE Labs.
- * $Id: aperture.c,v 1.7 2003/08/01 03:36:18 ak Exp $
+ * $Id: aperture.c,v 1.8 2004/02/27 18:30:19 ak Exp $
  */
 #include <linux/config.h>
 #include <linux/kernel.h>
@@ -27,6 +27,8 @@
 int fallback_aper_order __initdata = 1; /* 64MB */
 int fallback_aper_force __initdata = 0; 
 
+int iommu_aperture;
+
 extern int no_iommu, force_mmu;
 
 /* This code runs before the PCI subsystem is initialized, so just 
@@ -198,6 +200,8 @@
 		if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) 
 			continue;	
 
+		iommu_aperture = 1;
+
 		aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; 
 		aper_size = (32 * 1024 * 1024) << aper_order; 
 		aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff;