From: BitKeeper B. <ri...@su...> - 2005-03-26 00:06:25
|
ChangeSet 1.1368, 2005/03/25 22:05:07-07:00, djm@sportsman.spdomain Catch up to latest xeno-unstable arch/ia64/domain.c | 3 ++- include/asm-ia64/debugger.h | 2 ++ include/asm-ia64/flushtlb.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c --- a/xen/arch/ia64/domain.c 2005-03-25 19:06:21 -05:00 +++ b/xen/arch/ia64/domain.c 2005-03-25 19:06:21 -05:00 @@ -109,7 +109,8 @@ /* 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 -Nru a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h --- a/xen/include/asm-ia64/debugger.h 2005-03-25 19:06:21 -05:00 +++ b/xen/include/asm-ia64/debugger.h 2005-03-25 19:06:21 -05:00 @@ -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 -Nru a/xen/include/asm-ia64/flushtlb.h b/xen/include/asm-ia64/flushtlb.h --- a/xen/include/asm-ia64/flushtlb.h 2005-03-25 19:06:21 -05:00 +++ b/xen/include/asm-ia64/flushtlb.h 2005-03-25 19:06:21 -05:00 @@ -8,6 +8,7 @@ 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 |