diff options
Diffstat (limited to 'i386')
| -rw-r--r-- | i386/configfrag.ac | 18 | ||||
| -rw-r--r-- | i386/i386at/interrupt.S | 5 |
2 files changed, 20 insertions, 3 deletions
diff --git a/i386/configfrag.ac b/i386/configfrag.ac index 6cd1fdf7..ec0a3009 100644 --- a/i386/configfrag.ac +++ b/i386/configfrag.ac @@ -100,11 +100,29 @@ AC_ARG_ENABLE([apic], enable_apic=yes [fi] +[if [ $mach_ncpus -gt 1 ]; then] + # Do not enable in SMP, it is not MP-safe + enable_linux_groups=no +[fi] + +[case $host_platform:$host_cpu in + at:i?86) + :;; + *) + # Linux glue was only really tested on i386 + enable_linux_groups=no;; +esac] + [if [ x"$enable_linux_groups" != xno ]; then] # Linux glue does not like APIC enable_apic=no [fi] +[case $host_platform:$host_cpu in + xen:*) + enable_apic=no;; +esac] + [if [ x"$enable_apic" = xno ]; then] AM_CONDITIONAL([enable_apic], [false]) [else] diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S index ac71473b..164b0939 100644 --- a/i386/i386at/interrupt.S +++ b/i386/i386at/interrupt.S @@ -124,11 +124,10 @@ _call_handler: movl S_IRQ,%eax /* copy irq number */ - shll $2,%eax /* irq * 4 */ - movl EXT(iunit)(%eax),%edx /* get device unit number */ + movl EXT(iunit)(,%eax,4),%edx /* get device unit number */ movl %edx,(%esp) /* unit number as 1st arg */ - call *EXT(ivect)(%eax) /* call interrupt handler */ + call *EXT(ivect)(,%eax,4) /* call interrupt handler */ movl S_IRQ,%ecx /* restore irq number */ movb EXT(irqinfo)(,%ecx,2),%al /* look up irq_info[irq].trigger */ |