ia64/xen-unstable

changeset 3185:ceb18328156a

bitkeeper revision 1.1159.183.25 (41aa3134G_z_Y-xcfZPe1pfsJn6AMg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Sun Nov 28 20:12:36 2004 +0000 (2004-11-28)
parents ee14738f68ba d24f12a92284
children 8efbd2c0687b
files buildconfigs/Rules.mk linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c patches/linux-2.6.9/agpgart.patch patches/linux-2.6.9/drm.patch patches/linux-2.6.9/nettel.patch
line diff
     1.1 --- a/buildconfigs/Rules.mk	Sun Nov 28 08:55:46 2004 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Sun Nov 28 20:12:36 2004 +0000
     1.3 @@ -48,6 +48,9 @@ pristine-%: %.tar.bz2
     1.4  	mv tmp-$(@F)/* $@
     1.5  	touch $@ # update timestamp to avoid rebuild
     1.6  	@rm -rf tmp-$(@F)
     1.7 +	[ -d patches/$* ] && \
     1.8 +	  for i in patches/$*/*.patch ; do ( cd $@ ; patch -p1 <../$$i ) ; done || \
     1.9 +	  true
    1.10  
    1.11  %-build:
    1.12  	$(MAKE) -f buildconfigs/mk.$* build
     2.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c	Sun Nov 28 08:55:46 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c	Sun Nov 28 20:12:36 2004 +0000
     2.3 @@ -782,7 +782,7 @@ static int blkif_queue_request(unsigned 
     2.4                                 unsigned short  nr_sectors,
     2.5                                 kdev_t          device)
     2.6  {
     2.7 -    unsigned long       buffer_ma = phys_to_machine(virt_to_phys(buffer)); 
     2.8 +    unsigned long       buffer_ma = virt_to_bus(buffer);
     2.9      unsigned long       xid;
    2.10      struct gendisk     *gd;
    2.11      blkif_request_t    *req;
     3.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c	Sun Nov 28 08:55:46 2004 +0000
     3.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c	Sun Nov 28 20:12:36 2004 +0000
     3.3 @@ -383,7 +383,7 @@ static void network_alloc_rx_buffers(str
     3.4          rx_pfn_array[i] = virt_to_machine(skb->head) >> PAGE_SHIFT;
     3.5  
     3.6  	/* Remove this page from pseudo phys map before passing back to Xen. */
     3.7 -	phys_to_machine_mapping[virt_to_phys(skb->head) >> PAGE_SHIFT] 
     3.8 +	phys_to_machine_mapping[__pa(skb->head) >> PAGE_SHIFT] 
     3.9  	    = INVALID_P2M_ENTRY;
    3.10  
    3.11          rx_mcl[i].op = __HYPERVISOR_update_va_mapping;
     4.1 --- a/patches/linux-2.6.9/agpgart.patch	Sun Nov 28 08:55:46 2004 +0000
     4.2 +++ b/patches/linux-2.6.9/agpgart.patch	Sun Nov 28 20:12:36 2004 +0000
     4.3 @@ -1,5 +1,6 @@
     4.4 ---- linux-2.6.8.1/drivers/char/agp/ali-agp.c	2004-08-14 11:55:35.000000000 +0100
     4.5 -+++ linux-2.6.8.1-xen0/drivers/char/agp/ali-agp.c	2004-09-05 05:55:58.876495340 +0100
     4.6 +diff -ur linux-2.6.9/drivers/char/agp/ali-agp.c linux-2.6.9-new/drivers/char/agp/ali-agp.c
     4.7 +--- linux-2.6.9/drivers/char/agp/ali-agp.c	2004-10-18 22:54:38.000000000 +0100
     4.8 ++++ linux-2.6.9-new/drivers/char/agp/ali-agp.c	2004-11-28 19:32:03.000000000 +0000
     4.9  @@ -150,7 +150,7 @@
    4.10   	pci_read_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL, &temp);
    4.11   	pci_write_config_dword(agp_bridge->dev, ALI_CACHE_FLUSH_CTRL,
    4.12 @@ -18,8 +19,9 @@
    4.13   	agp_generic_destroy_page(addr);
    4.14   }
    4.15   
    4.16 ---- linux-2.6.8.1/drivers/char/agp/amd-k7-agp.c	2004-08-14 11:56:24.000000000 +0100
    4.17 -+++ linux-2.6.8.1-xen0/drivers/char/agp/amd-k7-agp.c	2004-09-05 05:55:58.877495108 +0100
    4.18 +diff -ur linux-2.6.9/drivers/char/agp/amd-k7-agp.c linux-2.6.9-new/drivers/char/agp/amd-k7-agp.c
    4.19 +--- linux-2.6.9/drivers/char/agp/amd-k7-agp.c	2004-10-18 22:55:36.000000000 +0100
    4.20 ++++ linux-2.6.9-new/drivers/char/agp/amd-k7-agp.c	2004-11-28 19:36:39.000000000 +0000
    4.21  @@ -43,7 +43,7 @@
    4.22   
    4.23   	SetPageReserved(virt_to_page(page_map->real));
    4.24 @@ -32,23 +34,24 @@
    4.25  @@ -152,7 +152,7 @@
    4.26   
    4.27   	agp_bridge->gatt_table_real = (u32 *)page_dir.real;
    4.28 - 	agp_bridge->gatt_table = (u32 *)page_dir.remapped;
    4.29 + 	agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
    4.30  -	agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
    4.31  +	agp_bridge->gatt_bus_addr = virt_to_bus(page_dir.real);
    4.32   
    4.33   	/* Get the address for the gart region.
    4.34   	 * This is a bus address even on the alpha, b/c its
    4.35 -@@ -166,7 +166,7 @@
    4.36 +@@ -165,7 +165,7 @@
    4.37 + 
    4.38   	/* Calculate the agp offset */
    4.39   	for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
    4.40 - 		page_dir.remapped[GET_PAGE_DIR_OFF(addr)] =
    4.41 --			virt_to_phys(amd_irongate_private.gatt_pages[i]->real);
    4.42 -+			virt_to_bus(amd_irongate_private.gatt_pages[i]->real);
    4.43 - 		page_dir.remapped[GET_PAGE_DIR_OFF(addr)] |= 0x00000001;
    4.44 +-		writel(virt_to_phys(amd_irongate_private.gatt_pages[i]->real) | 1,
    4.45 ++		writel(virt_to_bus(amd_irongate_private.gatt_pages[i]->real) | 1,
    4.46 + 			page_dir.remapped+GET_PAGE_DIR_OFF(addr));
    4.47   	}
    4.48   
    4.49 ---- linux-2.6.8.1/drivers/char/agp/amd64-agp.c	2004-08-14 11:55:47.000000000 +0100
    4.50 -+++ linux-2.6.8.1-xen0/drivers/char/agp/amd64-agp.c	2004-09-05 05:55:58.877495108 +0100
    4.51 +diff -ur linux-2.6.9/drivers/char/agp/amd64-agp.c linux-2.6.9-new/drivers/char/agp/amd64-agp.c
    4.52 +--- linux-2.6.9/drivers/char/agp/amd64-agp.c	2004-10-18 22:54:38.000000000 +0100
    4.53 ++++ linux-2.6.9-new/drivers/char/agp/amd64-agp.c	2004-11-28 19:32:03.000000000 +0000
    4.54  @@ -212,7 +212,7 @@
    4.55   
    4.56   static int amd_8151_configure(void)
    4.57 @@ -67,8 +70,9 @@
    4.58   			   amd64_aperture_sizes[bridge->aperture_size_idx].size);
    4.59   	agp_remove_bridge(bridge);
    4.60   	agp_put_bridge(bridge);
    4.61 ---- linux-2.6.8.1/drivers/char/agp/ati-agp.c	2004-08-14 11:55:48.000000000 +0100
    4.62 -+++ linux-2.6.8.1-xen0/drivers/char/agp/ati-agp.c	2004-09-05 05:55:58.877495108 +0100
    4.63 +diff -ur linux-2.6.9/drivers/char/agp/ati-agp.c linux-2.6.9-new/drivers/char/agp/ati-agp.c
    4.64 +--- linux-2.6.9/drivers/char/agp/ati-agp.c	2004-10-18 22:54:40.000000000 +0100
    4.65 ++++ linux-2.6.9-new/drivers/char/agp/ati-agp.c	2004-11-28 19:32:03.000000000 +0000
    4.66  @@ -64,7 +64,7 @@
    4.67   
    4.68   	/* CACHE_FLUSH(); */
    4.69 @@ -78,8 +82,9 @@
    4.70   					    PAGE_SIZE);
    4.71   	if (page_map->remapped == NULL || err) {
    4.72   		ClearPageReserved(virt_to_page(page_map->real));
    4.73 ---- linux-2.6.8.1/drivers/char/agp/backend.c	2004-08-14 11:55:47.000000000 +0100
    4.74 -+++ linux-2.6.8.1-xen0/drivers/char/agp/backend.c	2004-09-05 05:55:58.878494876 +0100
    4.75 +diff -ur linux-2.6.9/drivers/char/agp/backend.c linux-2.6.9-new/drivers/char/agp/backend.c
    4.76 +--- linux-2.6.9/drivers/char/agp/backend.c	2004-10-18 22:54:39.000000000 +0100
    4.77 ++++ linux-2.6.9-new/drivers/char/agp/backend.c	2004-11-28 19:32:03.000000000 +0000
    4.78  @@ -142,7 +142,7 @@
    4.79   			return -ENOMEM;
    4.80   		}
    4.81 @@ -107,9 +112,22 @@
    4.82   }
    4.83   
    4.84   static const drm_agp_t drm_agp = {
    4.85 ---- linux-2.6.8.1/drivers/char/agp/generic.c	2004-08-14 11:55:10.000000000 +0100
    4.86 -+++ linux-2.6.8.1-xen0/drivers/char/agp/generic.c	2004-09-05 05:55:58.879494644 +0100
    4.87 -@@ -127,7 +127,7 @@
    4.88 +diff -ur linux-2.6.9/drivers/char/agp/efficeon-agp.c linux-2.6.9-new/drivers/char/agp/efficeon-agp.c
    4.89 +--- linux-2.6.9/drivers/char/agp/efficeon-agp.c	2004-10-18 22:53:06.000000000 +0100
    4.90 ++++ linux-2.6.9-new/drivers/char/agp/efficeon-agp.c	2004-11-28 19:38:28.000000000 +0000
    4.91 +@@ -219,7 +219,7 @@
    4.92 + 
    4.93 + 		efficeon_private.l1_table[index] = page;
    4.94 + 
    4.95 +-		value = __pa(page) | pati | present | index;
    4.96 ++		value = virt_to_bus(page) | pati | present | index;
    4.97 + 
    4.98 + 		pci_write_config_dword(agp_bridge->dev,
    4.99 + 			EFFICEON_ATTPAGE, value);
   4.100 +diff -ur linux-2.6.9/drivers/char/agp/generic.c linux-2.6.9-new/drivers/char/agp/generic.c
   4.101 +--- linux-2.6.9/drivers/char/agp/generic.c	2004-10-18 22:53:50.000000000 +0100
   4.102 ++++ linux-2.6.9-new/drivers/char/agp/generic.c	2004-11-28 19:32:03.000000000 +0000
   4.103 +@@ -128,7 +128,7 @@
   4.104   	}
   4.105   	if (curr->page_count != 0) {
   4.106   		for (i = 0; i < curr->page_count; i++) {
   4.107 @@ -118,7 +136,7 @@
   4.108   		}
   4.109   	}
   4.110   	agp_free_key(curr->key);
   4.111 -@@ -181,7 +181,7 @@
   4.112 +@@ -182,7 +182,7 @@
   4.113   			return NULL;
   4.114   		}
   4.115   		new->memory[i] =
   4.116 @@ -127,7 +145,7 @@
   4.117   		new->page_count++;
   4.118   	}
   4.119   
   4.120 -@@ -636,6 +636,7 @@
   4.121 +@@ -637,6 +637,7 @@
   4.122   	int i;
   4.123   	void *temp;
   4.124   	struct page *page;
   4.125 @@ -135,7 +153,7 @@
   4.126   
   4.127   	/* The generic routines can't handle 2 level gatt's */
   4.128   	if (agp_bridge->driver->size_type == LVL2_APER_SIZE)
   4.129 -@@ -674,8 +675,10 @@
   4.130 +@@ -675,8 +676,10 @@
   4.131   				break;
   4.132   			}
   4.133   
   4.134 @@ -148,7 +166,7 @@
   4.135   
   4.136   			if (table == NULL) {
   4.137   				i++;
   4.138 -@@ -706,7 +709,9 @@
   4.139 +@@ -707,7 +710,9 @@
   4.140   		size = ((struct aper_size_info_fixed *) temp)->size;
   4.141   		page_order = ((struct aper_size_info_fixed *) temp)->page_order;
   4.142   		num_entries = ((struct aper_size_info_fixed *) temp)->num_entries;
   4.143 @@ -159,7 +177,7 @@
   4.144   	}
   4.145   
   4.146   	if (table == NULL)
   4.147 -@@ -721,7 +726,7 @@
   4.148 +@@ -722,7 +727,7 @@
   4.149   	agp_gatt_table = (void *)table;
   4.150   
   4.151   	agp_bridge->driver->cache_flush();
   4.152 @@ -168,7 +186,7 @@
   4.153   					(PAGE_SIZE * (1 << page_order)));
   4.154   	agp_bridge->driver->cache_flush();
   4.155   
   4.156 -@@ -729,11 +734,12 @@
   4.157 +@@ -730,11 +735,12 @@
   4.158   		for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
   4.159   			ClearPageReserved(page);
   4.160   
   4.161 @@ -183,7 +201,7 @@
   4.162   
   4.163   	/* AK: bogus, should encode addresses > 4GB */
   4.164   	for (i = 0; i < num_entries; i++)
   4.165 -@@ -785,7 +791,8 @@
   4.166 +@@ -786,7 +792,8 @@
   4.167   	for (page = virt_to_page(table); page <= virt_to_page(table_end); page++)
   4.168   		ClearPageReserved(page);
   4.169   
   4.170 @@ -193,8 +211,9 @@
   4.171   
   4.172   	agp_gatt_table = NULL;
   4.173   	agp_bridge->gatt_table = NULL;
   4.174 ---- linux-2.6.8.1/drivers/char/agp/hp-agp.c	2004-08-14 11:55:59.000000000 +0100
   4.175 -+++ linux-2.6.8.1-xen0/drivers/char/agp/hp-agp.c	2004-09-05 05:55:58.879494644 +0100
   4.176 +diff -ur linux-2.6.9/drivers/char/agp/hp-agp.c linux-2.6.9-new/drivers/char/agp/hp-agp.c
   4.177 +--- linux-2.6.9/drivers/char/agp/hp-agp.c	2004-10-18 22:54:55.000000000 +0100
   4.178 ++++ linux-2.6.9-new/drivers/char/agp/hp-agp.c	2004-11-28 19:32:03.000000000 +0000
   4.179  @@ -110,7 +110,7 @@
   4.180   	hp->gart_size = HP_ZX1_GART_SIZE;
   4.181   	hp->gatt_entries = hp->gart_size / hp->io_page_size;
   4.182 @@ -213,8 +232,9 @@
   4.183   		OUTREG64(hp->ioc_regs, HP_ZX1_TCNFG, hp->io_tlb_ps);
   4.184   		OUTREG64(hp->ioc_regs, HP_ZX1_IMASK, ~(HP_ZX1_IOVA_SIZE - 1));
   4.185   		OUTREG64(hp->ioc_regs, HP_ZX1_IBASE, hp->iova_base | 0x1);
   4.186 ---- linux-2.6.8.1/drivers/char/agp/i460-agp.c	2004-08-14 11:55:34.000000000 +0100
   4.187 -+++ linux-2.6.8.1-xen0/drivers/char/agp/i460-agp.c	2004-09-05 05:55:58.879494644 +0100
   4.188 +diff -ur linux-2.6.9/drivers/char/agp/i460-agp.c linux-2.6.9-new/drivers/char/agp/i460-agp.c
   4.189 +--- linux-2.6.9/drivers/char/agp/i460-agp.c	2004-10-18 22:54:32.000000000 +0100
   4.190 ++++ linux-2.6.9-new/drivers/char/agp/i460-agp.c	2004-11-28 19:32:03.000000000 +0000
   4.191  @@ -371,7 +371,7 @@
   4.192   	}
   4.193   	memset(lp->alloced_map, 0, map_size);
   4.194 @@ -233,8 +253,9 @@
   4.195   	atomic_sub(I460_KPAGES_PER_IOPAGE, &agp_bridge->current_memory_agp);
   4.196   }
   4.197   
   4.198 ---- linux-2.6.8.1/drivers/char/agp/intel-agp.c	2004-08-14 11:55:32.000000000 +0100
   4.199 -+++ linux-2.6.8.1-xen0/drivers/char/agp/intel-agp.c	2004-09-05 05:55:58.880494412 +0100
   4.200 +diff -ur linux-2.6.9/drivers/char/agp/intel-agp.c linux-2.6.9-new/drivers/char/agp/intel-agp.c
   4.201 +--- linux-2.6.9/drivers/char/agp/intel-agp.c	2004-10-18 22:54:08.000000000 +0100
   4.202 ++++ linux-2.6.9-new/drivers/char/agp/intel-agp.c	2004-11-28 19:37:22.000000000 +0000
   4.203  @@ -285,7 +285,7 @@
   4.204   	if (new == NULL)
   4.205   		return NULL;
   4.206 @@ -251,14 +272,15 @@
   4.207  -			i8xx_destroy_pages(phys_to_virt(curr->memory[0]));
   4.208  +			i8xx_destroy_pages(bus_to_virt(curr->memory[0]));
   4.209   		else
   4.210 - 	   		agp_bridge->driver->agp_destroy_page(
   4.211 + 			agp_bridge->driver->agp_destroy_page(
   4.212  -				 phys_to_virt(curr->memory[0]));
   4.213  +				 bus_to_virt(curr->memory[0]));
   4.214   		vfree(curr->memory);
   4.215   	}
   4.216   	kfree(curr);
   4.217 ---- linux-2.6.8.1/drivers/char/agp/intel-mch-agp.c	2004-08-14 11:54:49.000000000 +0100
   4.218 -+++ linux-2.6.8.1-xen0/drivers/char/agp/intel-mch-agp.c	2004-09-05 05:55:58.880494412 +0100
   4.219 +diff -ur linux-2.6.9/drivers/char/agp/intel-mch-agp.c linux-2.6.9-new/drivers/char/agp/intel-mch-agp.c
   4.220 +--- linux-2.6.9/drivers/char/agp/intel-mch-agp.c	2004-10-18 22:53:13.000000000 +0100
   4.221 ++++ linux-2.6.9-new/drivers/char/agp/intel-mch-agp.c	2004-11-28 19:32:03.000000000 +0000
   4.222  @@ -51,7 +51,7 @@
   4.223   	if (new == NULL)
   4.224   		return NULL;
   4.225 @@ -277,8 +299,9 @@
   4.226   		vfree(curr->memory);
   4.227   	}
   4.228   	kfree(curr);
   4.229 ---- linux-2.6.8.1/drivers/char/agp/sworks-agp.c	2004-08-14 11:55:10.000000000 +0100
   4.230 -+++ linux-2.6.8.1-xen0/drivers/char/agp/sworks-agp.c	2004-09-05 05:55:58.881494180 +0100
   4.231 +diff -ur linux-2.6.9/drivers/char/agp/sworks-agp.c linux-2.6.9-new/drivers/char/agp/sworks-agp.c
   4.232 +--- linux-2.6.9/drivers/char/agp/sworks-agp.c	2004-10-18 22:53:50.000000000 +0100
   4.233 ++++ linux-2.6.9-new/drivers/char/agp/sworks-agp.c	2004-11-28 19:38:02.000000000 +0000
   4.234  @@ -51,7 +51,7 @@
   4.235   	}
   4.236   	SetPageReserved(virt_to_page(page_map->real));
   4.237 @@ -288,35 +311,36 @@
   4.238   					    PAGE_SIZE);
   4.239   	if (page_map->remapped == NULL) {
   4.240   		ClearPageReserved(virt_to_page(page_map->real));
   4.241 -@@ -164,7 +164,7 @@
   4.242 +@@ -162,7 +162,7 @@
   4.243 + 	/* Create a fake scratch directory */
   4.244   	for(i = 0; i < 1024; i++) {
   4.245 - 		serverworks_private.scratch_dir.remapped[i] = (unsigned long) agp_bridge->scratch_page;
   4.246 - 		page_dir.remapped[i] =
   4.247 --			virt_to_phys(serverworks_private.scratch_dir.real);
   4.248 -+			virt_to_bus(serverworks_private.scratch_dir.real);
   4.249 - 		page_dir.remapped[i] |= 0x00000001;
   4.250 + 		writel(agp_bridge->scratch_page, serverworks_private.scratch_dir.remapped+i);
   4.251 +-		writel(virt_to_phys(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
   4.252 ++		writel(virt_to_bus(serverworks_private.scratch_dir.real) | 1, page_dir.remapped+i);
   4.253   	}
   4.254   
   4.255 -@@ -177,7 +177,7 @@
   4.256 + 	retval = serverworks_create_gatt_pages(value->num_entries / 1024);
   4.257 +@@ -174,7 +174,7 @@
   4.258   
   4.259   	agp_bridge->gatt_table_real = (u32 *)page_dir.real;
   4.260 - 	agp_bridge->gatt_table = (u32 *)page_dir.remapped;
   4.261 + 	agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
   4.262  -	agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
   4.263  +	agp_bridge->gatt_bus_addr = virt_to_bus(page_dir.real);
   4.264   
   4.265   	/* Get the address for the gart region.
   4.266   	 * This is a bus address even on the alpha, b/c its
   4.267 -@@ -191,7 +191,7 @@
   4.268 +@@ -187,7 +187,7 @@
   4.269 + 	/* Calculate the agp offset */	
   4.270   
   4.271 - 	for(i = 0; i < value->num_entries / 1024; i++) {
   4.272 - 		page_dir.remapped[i] =
   4.273 --			virt_to_phys(serverworks_private.gatt_pages[i]->real);
   4.274 -+			virt_to_bus(serverworks_private.gatt_pages[i]->real);
   4.275 - 		page_dir.remapped[i] |= 0x00000001;
   4.276 - 	}
   4.277 + 	for(i = 0; i < value->num_entries / 1024; i++)
   4.278 +-		writel(virt_to_phys(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
   4.279 ++		writel(virt_to_bus(serverworks_private.gatt_pages[i]->real)|1, page_dir.remapped+i);
   4.280   
   4.281 ---- linux-2.6.8.1/drivers/char/agp/uninorth-agp.c	2004-08-14 11:55:32.000000000 +0100
   4.282 -+++ linux-2.6.8.1-xen0/drivers/char/agp/uninorth-agp.c	2004-09-05 05:55:58.881494180 +0100
   4.283 + 	return 0;
   4.284 + }
   4.285 +diff -ur linux-2.6.9/drivers/char/agp/uninorth-agp.c linux-2.6.9-new/drivers/char/agp/uninorth-agp.c
   4.286 +--- linux-2.6.9/drivers/char/agp/uninorth-agp.c	2004-10-18 22:54:29.000000000 +0100
   4.287 ++++ linux-2.6.9-new/drivers/char/agp/uninorth-agp.c	2004-11-28 19:32:03.000000000 +0000
   4.288  @@ -200,7 +200,7 @@
   4.289   
   4.290   	agp_bridge->gatt_table_real = (u32 *) table;
   4.291 @@ -326,8 +350,9 @@
   4.292   
   4.293   	for (i = 0; i < num_entries; i++) {
   4.294   		agp_bridge->gatt_table[i] =
   4.295 ---- linux-2.6.8.1/include/asm-i386/agp.h	2004-08-14 11:54:47.000000000 +0100
   4.296 -+++ linux-2.6.8.1-xen0/include/asm-i386/agp.h	2004-09-05 05:57:26.040268956 +0100
   4.297 +diff -ur linux-2.6.9/include/asm-i386/agp.h linux-2.6.9-new/include/asm-i386/agp.h
   4.298 +--- linux-2.6.9/include/asm-i386/agp.h	2004-10-18 22:53:06.000000000 +0100
   4.299 ++++ linux-2.6.9-new/include/asm-i386/agp.h	2004-11-28 19:32:03.000000000 +0000
   4.300  @@ -3,6 +3,7 @@
   4.301   
   4.302   #include <asm/pgtable.h>
     5.1 --- a/patches/linux-2.6.9/drm.patch	Sun Nov 28 08:55:46 2004 +0000
     5.2 +++ b/patches/linux-2.6.9/drm.patch	Sun Nov 28 20:12:36 2004 +0000
     5.3 @@ -1,5 +1,6 @@
     5.4 ---- linux-2.6.8.1/drivers/char/drm/ati_pcigart.h	2004-08-14 11:56:14.000000000 +0100
     5.5 -+++ linux-2.6.8.1-xen0/drivers/char/drm/ati_pcigart.h	2004-09-05 06:14:51.751782846 +0100
     5.6 +diff -ur linux-2.6.9/drivers/char/drm/ati_pcigart.h linux-2.6.9-new/drivers/char/drm/ati_pcigart.h
     5.7 +--- linux-2.6.9/drivers/char/drm/ati_pcigart.h	2004-10-18 22:55:07.000000000 +0100
     5.8 ++++ linux-2.6.9-new/drivers/char/drm/ati_pcigart.h	2004-11-28 19:42:41.000000000 +0000
     5.9  @@ -158,7 +158,7 @@
    5.10   	ret = 1;
    5.11   
     6.1 --- a/patches/linux-2.6.9/nettel.patch	Sun Nov 28 08:55:46 2004 +0000
     6.2 +++ b/patches/linux-2.6.9/nettel.patch	Sun Nov 28 20:12:36 2004 +0000
     6.3 @@ -1,6 +1,6 @@
     6.4 -diff -ru linux-2.6.8.1/drivers/mtd/maps/nettel.c linux-2.6.8.1-xen0/drivers/mtd/maps/nettel.c
     6.5 ---- linux-2.6.8.1/drivers/mtd/maps/nettel.c	2004-10-21 15:59:29.000000000 -0600
     6.6 -+++ linux-2.6.8.1-xen0/drivers/mtd/maps/nettel.c	2004-10-22 09:12:17.000000000 -0600
     6.7 +diff -ur linux-2.6.9/drivers/mtd/maps/nettel.c linux-2.6.9-new/drivers/mtd/maps/nettel.c
     6.8 +--- linux-2.6.9/drivers/mtd/maps/nettel.c	2004-10-18 22:53:44.000000000 +0100
     6.9 ++++ linux-2.6.9-new/drivers/mtd/maps/nettel.c	2004-11-28 19:45:35.000000000 +0000
    6.10  @@ -270,7 +270,7 @@
    6.11   	maxsize = AMD_WINDOW_MAXSIZE;
    6.12