# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID c7020299facc4940b245b3f5280d6bf6ef6a77b1
# Parent 05d8c51c7550dccc5d342275ba64af457d3388fd
Revert accidental commit.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
diff -r 05d8c51c7550 -r c7020299facc
linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Wed Mar 29 17:41:30 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c Wed Mar 29 17:46:51 2006
@@ -253,7 +253,6 @@
switch (frontend_state) {
case XenbusStateInitialising:
- case XenbusStateConnected:
break;
case XenbusStateInitialised:
diff -r 05d8c51c7550 -r c7020299facc xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c Wed Mar 29 17:41:30 2006
+++ b/xen/arch/x86/domain.c Wed Mar 29 17:46:51 2006
@@ -226,13 +226,6 @@
v->arch.schedule_tail = is_idle_domain(d) ?
continue_idle_domain : continue_nonidle_domain;
- percpu_ctxt[vcpu_id].curr_vcpu = v;
- v->arch.schedule_tail = continue_idle_domain;
- }
- else
- {
- v->arch.schedule_tail = continue_nonidle_domain;
- }
v->arch.ctxt_switch_from = paravirt_ctxt_switch_from;
v->arch.ctxt_switch_to = paravirt_ctxt_switch_to;
diff -r 05d8c51c7550 -r c7020299facc xen/arch/x86/smpboot.c
--- a/xen/arch/x86/smpboot.c Wed Mar 29 17:41:30 2006
+++ b/xen/arch/x86/smpboot.c Wed Mar 29 17:46:51 2006
@@ -881,7 +881,6 @@
* Returns zero if CPU booted OK, else error code from wakeup_secondary_cpu.
*/
{
- struct vcpu *v;
unsigned long boot_error;
int timeout;
unsigned long start_eip;
diff -r 05d8c51c7550 -r c7020299facc xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h Wed Mar 29 17:41:30 2006
+++ b/xen/include/asm-x86/shadow.h Wed Mar 29 17:46:51 2006
@@ -662,14 +662,10 @@
if ( likely(!shadow_mode_refcounts(d)) )
return;
- shadow_lock(d);
-
if ( page_out_of_sync(page) )
__shadow_sync_mfn(d, page_to_mfn(page));
shadow_remove_all_access(d, page_to_mfn(page));
-
- shadow_unlock(d);
}
#endif
@@ -702,46 +698,6 @@
return 1;
}
-
- shadow_sync_and_drop_references(d, mfn_to_page(mfn));
- set_p2m_entry(d, gpfn, -1, &c1, &c2);
- set_gpfn_from_mfn(mfn, INVALID_M2P_ENTRY);
- shadow_unlock(d);
- domain_mmap_cache_destroy(&c1);
- domain_mmap_cache_destroy(&c2);
-}
-
-/************************************************************************/
-
-/*
- * Add another shadow reference to smfn.
- */
-static inline int
-get_shadow_ref(unsigned long smfn)
-{
- u32 x, nx;
-
- ASSERT(mfn_valid(smfn));
-
- x = mfn_to_page(smfn)->count_info;
- nx = x + 1;
-
- if ( unlikely(nx == 0) )
- {
- printk("get_shadow_ref overflow, gmfn=%" PRtype_info " smfn=%lx\n",
- mfn_to_page(smfn)->u.inuse.type_info & PGT_mfn_mask,
- smfn);
- BUG();
- }
-
- // Guarded by the shadow lock...
- //
- mfn_to_page(smfn)->count_info = nx;
-
- return 1;
-}
-
-extern void free_shadow_page(unsigned long smfn);
/*
* Drop a shadow reference to smfn.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home