aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@sportsman.spdomain <djm@sportsman.spdomain>2005-03-26 05:05:07 +0000
committerdjm@sportsman.spdomain <djm@sportsman.spdomain>2005-03-26 05:05:07 +0000
commit70c6a10ec5fec90ce027b990b2ac06fa4522db8f (patch)
treecf3939e4944c4c1c381a4d02ce4c28d44d37ab58
parent2a9142e541a5493aab282ce6e2e604a62107baf7 (diff)
downloadxen-70c6a10ec5fec90ce027b990b2ac06fa4522db8f.tar.gz
xen-70c6a10ec5fec90ce027b990b2ac06fa4522db8f.tar.bz2
xen-70c6a10ec5fec90ce027b990b2ac06fa4522db8f.zip
bitkeeper revision 1.1236.1.132 (4244ed83AbtrXuARZAN3FYhYSFTm7w)
Catch up to latest xeno-unstable
-rw-r--r--xen/arch/ia64/domain.c3
-rw-r--r--xen/include/asm-ia64/debugger.h2
-rw-r--r--xen/include/asm-ia64/flushtlb.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
index d955efa3f4..5c3aa5b475 100644
--- a/xen/arch/ia64/domain.c
+++ b/xen/arch/ia64/domain.c
@@ -109,7 +109,8 @@ void startup_cpu_idle_loop(void)
/* Just some sanity to ensure that the scheduler is set up okay. */
ASSERT(current->domain == IDLE_DOMAIN_ID);
domain_unpause_by_systemcontroller(current->domain);
- __enter_scheduler();
+ raise_softirq(SCHEDULE_SOFTIRQ);
+ do_softirq();
/*
* Declares CPU setup done to the boot processor.
diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h
index da06432b9c..459b7c2695 100644
--- a/xen/include/asm-ia64/debugger.h
+++ b/xen/include/asm-ia64/debugger.h
@@ -22,6 +22,8 @@
#ifndef __ASM_DEBUGGER_H__
#define __ASM_DEBUGGER_H__
+#include <xen/softirq.h>
+
/* The main trap handlers use these helper macros which include early bail. */
static inline int debugger_trap_entry(
unsigned int vector, struct xen_regs *regs)
diff --git a/xen/include/asm-ia64/flushtlb.h b/xen/include/asm-ia64/flushtlb.h
index beddd632f8..19c5c569e8 100644
--- a/xen/include/asm-ia64/flushtlb.h
+++ b/xen/include/asm-ia64/flushtlb.h
@@ -8,6 +8,7 @@ extern u32 tlbflush_clock;
extern u32 tlbflush_time[NR_CPUS];
#define tlbflush_current_time() tlbflush_clock
+#define tlbflush_filter_cpuset(x,y) (0)
#define NEED_FLUSH(x, y) (0)
#endif