diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-16 10:50:02 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-05-16 10:50:02 +0000 |
| commit | bfad55585786589fb608058034792e90b0cca1e4 (patch) | |
| tree | 4935190e49656dd01a568cabc9803d80f7994f21 /freebsd-5.3-xen-sparse | |
| parent | fa1bec6f50e52d93b4e842fb305d309768191771 (diff) | |
| download | xen-bfad55585786589fb608058034792e90b0cca1e4.tar.gz xen-bfad55585786589fb608058034792e90b0cca1e4.tar.bz2 xen-bfad55585786589fb608058034792e90b0cca1e4.zip | |
bitkeeper revision 1.1415 (42887ada_Jmkta2rYHnpJBE2EVpy4w)
Remove generic 'fast trap' from the Xen public interfaces. Internally
within Xen, we automatically set up direct trap for int 0x80, which is
the only 'fast trap' vector that we ever supported anyway.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'freebsd-5.3-xen-sparse')
| -rw-r--r-- | freebsd-5.3-xen-sparse/i386-xen/i386-xen/machdep.c | 3 | ||||
| -rw-r--r-- | freebsd-5.3-xen-sparse/i386-xen/i386-xen/mp_machdep.c | 6 | ||||
| -rw-r--r-- | freebsd-5.3-xen-sparse/i386-xen/include/hypervisor.h | 12 |
3 files changed, 2 insertions, 19 deletions
diff --git a/freebsd-5.3-xen-sparse/i386-xen/i386-xen/machdep.c b/freebsd-5.3-xen-sparse/i386-xen/i386-xen/machdep.c index 2343e63409..efda2eac13 100644 --- a/freebsd-5.3-xen-sparse/i386-xen/i386-xen/machdep.c +++ b/freebsd-5.3-xen-sparse/i386-xen/i386-xen/machdep.c @@ -1642,9 +1642,6 @@ init386(void) if ((error = HYPERVISOR_set_trap_table(trap_table)) != 0) { panic("set_trap_table failed - error %d\n", error); } - if ((error = HYPERVISOR_set_fast_trap(0x80)) != 0) { - panic("set_fast_trap failed - error %d\n", error); - } HYPERVISOR_set_callbacks(GSEL(GCODE_SEL, SEL_KPL), (unsigned long)Xhypervisor_callback, GSEL(GCODE_SEL, SEL_KPL), (unsigned long)failsafe_callback); diff --git a/freebsd-5.3-xen-sparse/i386-xen/i386-xen/mp_machdep.c b/freebsd-5.3-xen-sparse/i386-xen/i386-xen/mp_machdep.c index 64f42259e8..5ef412ac21 100644 --- a/freebsd-5.3-xen-sparse/i386-xen/i386-xen/mp_machdep.c +++ b/freebsd-5.3-xen-sparse/i386-xen/i386-xen/mp_machdep.c @@ -885,10 +885,9 @@ install_ap_tramp(void) } #endif -static int +static void cpu_mp_trap_init(trap_info_t *trap_ctxt) { - trap_info_t *t = trap_table; for (t = trap_table; t->address; t++) { @@ -896,7 +895,6 @@ cpu_mp_trap_init(trap_info_t *trap_ctxt) trap_ctxt[t->vector].cs = t->cs; trap_ctxt[t->vector].address = t->address; } - return 0x80 /*SYSCALL_VECTOR*/; } /* @@ -961,7 +959,7 @@ start_ap(int apic_id) ctxt.trap_ctxt[i].vector = i; ctxt.trap_ctxt[i].cs = FLAT_KERNEL_CS; } - ctxt.fast_trap_idx = cpu_mp_trap_init(ctxt.trap_ctxt); + cpu_mp_trap_init(ctxt.trap_ctxt); /* No LDT. */ ctxt.ldt_ents = 0; diff --git a/freebsd-5.3-xen-sparse/i386-xen/include/hypervisor.h b/freebsd-5.3-xen-sparse/i386-xen/include/hypervisor.h index 824ca96cee..0a290cef19 100644 --- a/freebsd-5.3-xen-sparse/i386-xen/include/hypervisor.h +++ b/freebsd-5.3-xen-sparse/i386-xen/include/hypervisor.h @@ -284,18 +284,6 @@ HYPERVISOR_update_descriptor( } static inline int -HYPERVISOR_set_fast_trap(int idx) -{ - int ret; - __asm__ __volatile__ ( - TRAP_INSTR - : "=a" (ret) : "0" (__HYPERVISOR_set_fast_trap), - "b" (idx) : "memory" ); - - return ret; -} - -static inline int HYPERVISOR_dom_mem_op(unsigned int op, unsigned long *pages, unsigned long nr_pages) |