ia64/xen-unstable

changeset 3962:180fe147132c

bitkeeper revision 1.1236.1.45 (42258857U4okIoyPxH5YjJWR8rXbew)

Xen emulates WBINVD -- reduce diffs in Linux 2.6 in light of this.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@scramble.cl.cam.ac.uk
date Wed Mar 02 09:33:11 2005 +0000 (2005-03-02)
parents a19f7bbbe144
children 24703bde489b f16176a68244 6fe925d85cd6
files linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h patches/linux-2.6.10/agpgart.patch
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h	Tue Mar 01 22:48:54 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Mar 02 09:33:11 2005 +0000
     1.3 @@ -119,13 +119,8 @@ static inline unsigned long _get_base(ch
     1.4  
     1.5  #endif	/* __KERNEL__ */
     1.6  
     1.7 -static inline void wbinvd(void)
     1.8 -{
     1.9 -	mmu_update_t u;
    1.10 -	u.ptr = MMU_EXTENDED_COMMAND;
    1.11 -	u.val = MMUEXT_FLUSH_CACHE;
    1.12 -	(void)HYPERVISOR_mmu_update(&u, 1, NULL);
    1.13 -}
    1.14 +#define wbinvd() \
    1.15 +	__asm__ __volatile__ ("wbinvd": : :"memory");
    1.16  
    1.17  static inline unsigned long get_limit(unsigned long segment)
    1.18  {
     2.1 --- a/patches/linux-2.6.10/agpgart.patch	Tue Mar 01 22:48:54 2005 +0000
     2.2 +++ b/patches/linux-2.6.10/agpgart.patch	Wed Mar 02 09:33:11 2005 +0000
     2.3 @@ -350,22 +350,3 @@ diff -ur linux-2.6.9/drivers/char/agp/un
     2.4   
     2.5   	for (i = 0; i < num_entries; i++) {
     2.6   		agp_bridge->gatt_table[i] =
     2.7 -diff -ur linux-2.6.9/include/asm-i386/agp.h linux-2.6.9-new/include/asm-i386/agp.h
     2.8 ---- linux-2.6.9/include/asm-i386/agp.h	2004-10-18 22:53:06.000000000 +0100
     2.9 -+++ linux-2.6.9-new/include/asm-i386/agp.h	2004-11-28 19:32:03.000000000 +0000
    2.10 -@@ -3,6 +3,7 @@
    2.11 - 
    2.12 - #include <asm/pgtable.h>
    2.13 - #include <asm/cacheflush.h>
    2.14 -+#include <asm/system.h>
    2.15 - 
    2.16 - /* 
    2.17 -  * Functions to keep the agpgart mappings coherent with the MMU.
    2.18 -@@ -19,6 +20,6 @@
    2.19 - /* Could use CLFLUSH here if the cpu supports it. But then it would
    2.20 -    need to be called for each cacheline of the whole page so it may not be 
    2.21 -    worth it. Would need a page for it. */
    2.22 --#define flush_agp_cache() asm volatile("wbinvd":::"memory")
    2.23 -+#define flush_agp_cache() wbinvd()
    2.24 - 
    2.25 - #endif