[Xen-changelog] manual merge

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1243, 2005/03/02 17:22:02+00:00, 
rneugeba@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

        manual merge
        
        Signed-off-by: michael.fetterman@xxxxxxxxxxxx



 tools/libxc/xc.h                  |   28 ++++++++++++++++++++++------
 xen/arch/x86/x86_32/asm-offsets.c |    6 ++++++
 2 files changed, 28 insertions(+), 6 deletions(-)


diff -Nru a/tools/libxc/xc.h b/tools/libxc/xc.h
--- a/tools/libxc/xc.h  2005-04-05 12:06:46 -04:00
+++ b/tools/libxc/xc.h  2005-04-05 12:06:46 -04:00
@@ -25,9 +25,25 @@
 #include <xen/event_channel.h>
 #include <xen/sched_ctl.h>
 
-/*\
+
+/*
+ *  DEFINITIONS FOR CPU BARRIERS
+ */ 
+
+#if defined(__i386__)
+#define rmb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
+#define wmb() __asm__ __volatile__ ("" : : : "memory")
+#elif defined(__x86_64__)
+#define mb()     asm volatile("mfence":::"memory")
+#define rmb()    asm volatile("lfence":::"memory")
+#define wmb()    asm volatile( "" :::"memory")
+#else
+#error "Define barriers"
+#endif
+
+/*
  *  INITIALIZATION FUNCTIONS
-\*/ 
+ */ 
 
 /**
  * This function opens a handle to the hypervisor interface.  This function can
@@ -55,9 +71,9 @@
  */
 int xc_interface_close(int xc_handle);
 
-/*\
+/*
  * DOMAIN MANAGEMENT FUNCTIONS
-\*/
+ */
 
 typedef struct {
     u32           domid;
@@ -257,9 +273,9 @@
 
 typedef evtchn_status_t xc_evtchn_status_t;
 
-/*\
+/*
  * EVENT CHANNEL FUNCTIONS
-\*/
+ */
 
 /**
  * This function allocates an unbound port.  Ports are named endpoints used for
diff -Nru a/xen/arch/x86/x86_32/asm-offsets.c 
b/xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c 2005-04-05 12:06:46 -04:00
+++ b/xen/arch/x86/x86_32/asm-offsets.c 2005-04-05 12:06:46 -04:00
@@ -6,6 +6,7 @@
 
 #include <xen/config.h>
 #include <xen/sched.h>
+#include <xen/config.h>
 
 #define DEFINE(_sym, _val) \
     __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )
@@ -75,4 +76,9 @@
     BLANK();
 
     DEFINE(FIXMAP_apic_base, fix_to_virt(FIX_APIC_BASE));
+
+#if PERF_COUNTERS
+    OFFSET(PERFC_hypercalls, struct perfcounter, hypercalls);
+    OFFSET(PERFC_exceptions, struct perfcounter, exceptions);
+#endif
 }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog