mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
kaf24@scramble.cl.cam.ac.uk
2dfd28a23f
Update the AGP+DRM patches for 2.6.9, and automatically patch the kernels before we build them. Also avoid using virt_to_phys() in our virtual drivers as we may change what it does -- better to use __pa().
31 lines
877 B
Diff
31 lines
877 B
Diff
diff -ur linux-2.6.9/drivers/mtd/maps/nettel.c linux-2.6.9-new/drivers/mtd/maps/nettel.c
|
|
--- linux-2.6.9/drivers/mtd/maps/nettel.c 2004-10-18 22:53:44.000000000 +0100
|
|
+++ linux-2.6.9-new/drivers/mtd/maps/nettel.c 2004-11-28 19:45:35.000000000 +0000
|
|
@@ -270,7 +270,7 @@
|
|
maxsize = AMD_WINDOW_MAXSIZE;
|
|
|
|
*amdpar = SC520_PAR(SC520_PAR_BOOTCS, amdaddr, maxsize);
|
|
- __asm__ ("wbinvd");
|
|
+ wbinvd();
|
|
|
|
nettel_amd_map.phys = amdaddr;
|
|
nettel_amd_map.virt = (unsigned long)
|
|
@@ -382,7 +382,7 @@
|
|
*/
|
|
intel1addr = intel0addr + intel0size;
|
|
*intel1par = SC520_PAR(intel1cs, intel1addr, maxsize);
|
|
- __asm__ ("wbinvd");
|
|
+ wbinvd();
|
|
|
|
maxsize += intel0size;
|
|
|
|
@@ -408,7 +408,7 @@
|
|
intel1size = intel_mtd->size - intel0size;
|
|
if (intel1size > 0) {
|
|
*intel1par = SC520_PAR(intel1cs, intel1addr, intel1size);
|
|
- __asm__ ("wbinvd");
|
|
+ wbinvd();
|
|
} else {
|
|
*intel1par = 0;
|
|
}
|