diff options
| author | jhb <jhb@FreeBSD.org> | 2004-02-03 22:00:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2004-02-03 22:00:42 +0000 |
| commit | 8c6d097bf4065e71f1887110cd294dca2db3e610 (patch) | |
| tree | b9a6efd2fe16362b210ece58d105d4016f3e1d9b /sys/i386/isa | |
| parent | a0aa7c9e9133ce18b756999f6a4b59a9a875bd7b (diff) | |
| download | FreeBSD-src-8c6d097bf4065e71f1887110cd294dca2db3e610.zip FreeBSD-src-8c6d097bf4065e71f1887110cd294dca2db3e610.tar.gz | |
Revert the skipping of segment register reloads as it appears to actually
be a pessimization on non Pentium4 CPUs. More importantly, it is buggy as
it can cause GPF's when using APM or vm86.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/atpic_vector.s | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s index 4b819ce..e3dc38f 100644 --- a/sys/i386/isa/atpic_vector.s +++ b/sys/i386/isa/atpic_vector.s @@ -63,15 +63,12 @@ IDTVEC(vec_name) ; \ pushl %ds ; /* save data and extra segments ... */ \ pushl %es ; \ pushl %fs ; \ - mov %fs,%ax ; /* get current per-cpu selector */ \ - cmp $KPSEL,%ax ; /* are we already in the kernel? */ \ - je 1f ; /* skip expensive segment reloads */ \ mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ mov %ax,%ds ; \ mov %ax,%es ; \ mov $KPSEL,%ax ; \ mov %ax,%fs ; \ -1: ; \ +; \ FAKE_MCOUNT(13*4(%esp)) ; /* XXX late to avoid double count */ \ pushl $irq_num; /* pass the IRQ */ \ call atpic_handle_intr ; \ |
