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>

diff --git a/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h
index 77b6a507bdf41cd4c76889829f4216a3daaf3575..cdd81a2ce2cbfc95d52a016d0d1cc09e88bd68c6 100644 (file)
--- a/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h
+++ b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/system.h
@@ -119,13 +119,8 @@ static inline unsigned long _get_base(char * addr)
 
 #endif /* __KERNEL__ */
 
-static inline void wbinvd(void)
-{
-       mmu_update_t u;
-       u.ptr = MMU_EXTENDED_COMMAND;
-       u.val = MMUEXT_FLUSH_CACHE;
-       (void)HYPERVISOR_mmu_update(&u, 1, NULL);
-}
+#define wbinvd() \
+       __asm__ __volatile__ ("wbinvd": : :"memory");
 
 static inline unsigned long get_limit(unsigned long segment)
 {

diff --git a/patches/linux-2.6.10/agpgart.patch b/patches/linux-2.6.10/agpgart.patch
index 249afd6f0bfc4fdea047cd7fdcc2d255b50431e1..3249eab31243829fd919cfae5c8524f10c6bccf3 100644 (file)
--- a/patches/linux-2.6.10/agpgart.patch
+++ b/patches/linux-2.6.10/agpgart.patch
@@ -350,22 +350,3 @@ diff -ur linux-2.6.9/drivers/char/agp/uninorth-agp.c linux-2.6.9-new/drivers/cha
  
        for (i = 0; i < num_entries; i++) {
                agp_bridge->gatt_table[i] =
-diff -ur linux-2.6.9/include/asm-i386/agp.h linux-2.6.9-new/include/asm-i386/agp.h
---- linux-2.6.9/include/asm-i386/agp.h 2004-10-18 22:53:06.000000000 +0100
-+++ linux-2.6.9-new/include/asm-i386/agp.h     2004-11-28 19:32:03.000000000 +0000
-@@ -3,6 +3,7 @@
- 
- #include <asm/pgtable.h>
- #include <asm/cacheflush.h>
-+#include <asm/system.h>
- 
- /* 
-  * Functions to keep the agpgart mappings coherent with the MMU.
-@@ -19,6 +20,6 @@
- /* Could use CLFLUSH here if the cpu supports it. But then it would
-    need to be called for each cacheline of the whole page so it may not be 
-    worth it. Would need a page for it. */
--#define flush_agp_cache() asm volatile("wbinvd":::"memory")
-+#define flush_agp_cache() wbinvd()
- 
- #endif