diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/i386/kernel/irq.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/i386/kernel/irq.h')
| -rw-r--r-- | arch/i386/kernel/irq.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/i386/kernel/irq.h b/arch/i386/kernel/irq.h index 9824026dc..81795c85c 100644 --- a/arch/i386/kernel/irq.h +++ b/arch/i386/kernel/irq.h @@ -23,10 +23,7 @@ void init_pic_mode (void); extern unsigned int io_apic_irqs; -extern inline int IO_APIC_VECTOR (int irq) -{ - return (0x51+(irq<<3)); -} +#define IO_APIC_VECTOR(irq) (0x51+((irq)<<3)) #define MAX_IRQ_SOURCES 128 #define MAX_MP_BUSSES 32 @@ -83,8 +80,8 @@ static inline void irq_exit(int cpu, unsigned int irq) #define SAVE_ALL \ "cld\n\t" \ - "push %es\n\t" \ - "push %ds\n\t" \ + "pushl %es\n\t" \ + "pushl %ds\n\t" \ "pushl %eax\n\t" \ "pushl %ebp\n\t" \ "pushl %edi\n\t" \ @@ -93,8 +90,8 @@ static inline void irq_exit(int cpu, unsigned int irq) "pushl %ecx\n\t" \ "pushl %ebx\n\t" \ "movl $" STR(__KERNEL_DS) ",%edx\n\t" \ - "mov %dx,%ds\n\t" \ - "mov %dx,%es\n\t" + "movl %dx,%ds\n\t" \ + "movl %dx,%es\n\t" #define IRQ_NAME2(nr) nr##_interrupt(void) #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) |