| |
|
 |
|
 |
|
|
|
| |
|
|
xen-changelog
[Xen-changelog] Merge bk://xen.bkbits.net/xeno-unstable.bk
ChangeSet 1.1367, 2005/03/25 14:20:40-08:00, xen-ia64.adm@xxxxxxxxxx
Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk
arch/ia64/patch/linux-2.6.7/time.c | 2 --
drivers/char/console.c | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff -Nru a/xen/arch/ia64/patch/linux-2.6.7/time.c
b/xen/arch/ia64/patch/linux-2.6.7/time.c
--- a/xen/arch/ia64/patch/linux-2.6.7/time.c 2005-03-25 19:06:17 -05:00
+++ b/xen/arch/ia64/patch/linux-2.6.7/time.c 2005-03-25 19:06:17 -05:00
@@ -1,5 +1,5 @@
--- ../../linux-2.6.7/arch/ia64/kernel/time.c 2004-06-15 23:19:01.000000000
-0600
-+++ arch/ia64/time.c 2005-03-09 13:22:52.000000000 -0700
++++ arch/ia64/time.c 2005-03-14 17:27:11.000000000 -0700
@@ -10,16 +10,22 @@
*/
#include <linux/config.h>
@@ -208,7 +208,7 @@
+ }
+ if (domain0_ready && vcpu_timer_expired(dom0->exec_domain[0])) {
+ vcpu_pend_timer(dom0->exec_domain[0]);
-+ vcpu_set_next_timer(dom0->exec_domain[0]);
++ //vcpu_set_next_timer(dom0->exec_domain[0]);
+ domain_wake(dom0->exec_domain[0]);
+ }
+ if (!is_idle_task(current->domain) && current->domain != dom0) {
diff -Nru a/xen/drivers/char/console.c b/xen/drivers/char/console.c
--- a/xen/drivers/char/console.c 2005-03-25 19:06:17 -05:00
+++ b/xen/drivers/char/console.c 2005-03-25 19:06:17 -05:00
@@ -643,3 +643,4 @@
* indent-tabs-mode: nil
* End:
*/
+
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/xen-changelog
|
|
|
| |
|
Home