This commit is contained in:
committed by
Git OBS Bridge
parent
9683113742
commit
9794955703
@@ -67,7 +67,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/Makefile
|
||||
+OBJS := $(XEN_TARGET_ARCH)/entry.o
|
||||
+OBJS += main.o console.o vsprintf.o string.o ctype.o
|
||||
+
|
||||
+CFLAGS += -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH)
|
||||
+CFLAGS += -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH) -I$(XEN_INCLUDE)
|
||||
+
|
||||
+ifeq ($(XEN_TARGET_ARCH),x86_32)
|
||||
+HLP_LDFLAGS := -melf_i386
|
||||
@@ -132,12 +132,12 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/console.c
|
||||
+
|
||||
+ cons = intf->out_cons;
|
||||
+ prod = intf->out_prod;
|
||||
+ mb();
|
||||
+ xen_mb();
|
||||
+
|
||||
+ while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
|
||||
+ intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
|
||||
+
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+ intf->out_prod = prod;
|
||||
+
|
||||
+ if (0 != notify_remote_via_evtchn(console_evtchn))
|
||||
@@ -456,7 +456,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+ return;
|
||||
+
|
||||
+ memset(xenstore_page, 0, PAGE_SIZE);
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+ printk("xs: debug fixup [zero page] done\r\n");
|
||||
+}
|
||||
+#endif
|
||||
@@ -541,7 +541,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+static void fillup_memory_p2m(void)
|
||||
+{
|
||||
+ struct xen_memory_reservation reservation = {
|
||||
+ .address_bits = 0,
|
||||
+ .mem_flags = 0,
|
||||
+ .extent_order = 0,
|
||||
+ .nr_extents = 1,
|
||||
+ .domid = DOMID_SELF,
|
||||
@@ -696,7 +696,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+ else
|
||||
+ map_page_32(page, mfn, flags);
|
||||
+ xen_tlb_flush();
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+}
|
||||
+
|
||||
+static void map_virt_base(void)
|
||||
@@ -706,7 +706,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+ else
|
||||
+ map_virt_base_32();
|
||||
+ xen_tlb_flush();
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+}
|
||||
+
|
||||
+static void fixup_pagetables_32(void)
|
||||
@@ -822,7 +822,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+ pte[pte_off] = (mfn << PAGE_SHIFT) | flags;
|
||||
+
|
||||
+ xen_tlb_flush();
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+}
|
||||
+
|
||||
+static void map_virt_base(void)
|
||||
@@ -857,7 +857,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
|
||||
+ pgd_low++;
|
||||
+ }
|
||||
+ xen_tlb_flush();
|
||||
+ wmb();
|
||||
+ xen_wmb();
|
||||
+}
|
||||
+
|
||||
+static void fixup_pagetables(void)
|
||||
|
Reference in New Issue
Block a user