From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 12 Jun 2008 09:27:22 +0000 (+0200)
Subject: Merge branch 'linus' into x86/gart
X-Git-Tag: v2.6.27-rc1~1106^2~251^10~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bb6dfb32f90094fea647e1f27d994a8b6ddd2766;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/gart
---

bb6dfb32f90094fea647e1f27d994a8b6ddd2766
diff --cc arch/x86/kernel/pci-gart_64.c
index 1f99b62ff61,aa8ec928caa..3710097f02e
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@@ -592,9 -615,26 +615,15 @@@ static __init int init_k8_gatt(struct a
  	agp_gatt_table = gatt;
  
  	for (i = 0; i < num_k8_northbridges; i++) {
 -		u32 gatt_reg;
 -		u32 ctl;
 -
  		dev = k8_northbridges[i];
 -		gatt_reg = __pa(gatt) >> 12;
 -		gatt_reg <<= 4;
 -		pci_write_config_dword(dev, 0x98, gatt_reg);
 -		pci_read_config_dword(dev, 0x90, &ctl);
 -
 -		ctl |= 1;
 -		ctl &= ~((1<<4) | (1<<5));
 -
 -		pci_write_config_dword(dev, 0x90, ctl);
 +		enable_gart_translation(dev, __pa(gatt));
  	}
+ 
+ 	error = sysdev_class_register(&gart_sysdev_class);
+ 	if (!error)
+ 		error = sysdev_register(&device_gart);
+ 	if (error)
+ 		panic("Could not register gart_sysdev -- would corrupt data on next suspend");
  	flush_gart();
  
  	printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n",