From e9ba91f35ef8df437d40b76bd3cce5bbd8996abf Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 28 Jan 2005 05:12:43 +0000 Subject: [PATCH] fixed merge bug --- arch/i386/kernel/irq.c | 3 --- arch/i386/kernel/vsyscall.lds.S | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c index 8e764bd00..be82494d0 100644 --- a/arch/i386/kernel/irq.c +++ b/arch/i386/kernel/irq.c @@ -222,9 +222,6 @@ asmlinkage int handle_IRQ_event(unsigned int irq, int status = 1; /* Force the "do bottom halves" bit */ int ret, retval = 0; - if (!(action->flags & SA_INTERRUPT)) - local_irq_enable(); - if (!(action->flags & SA_INTERRUPT)) local_irq_enable(); diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S index 3a8329d65..077ec94bc 100644 --- a/arch/i386/kernel/vsyscall.lds.S +++ b/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS { - . = VSYSCALL_BASE + SIZEOF_HEADERS; + . = SIZEOF_HEADERS; .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } @@ -20,7 +20,7 @@ SECTIONS For the layouts to match, we need to skip more than enough space for the dynamic symbol table et al. If this amount is insufficient, ld -shared will barf. Just increase it here. */ - . = VSYSCALL_BASE + 0x400; + . = 0x400; .text : { *(.text) } :text =0x90909090 -- 2.47.0