From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philippe Gerum In-Reply-To: <201104051603.53977.smolorz@domain.hid> References: <201104051603.53977.smolorz@domain.hid> Content-Type: text/plain; charset="UTF-8" Date: Tue, 05 Apr 2011 16:08:18 +0200 Message-ID: <1302012498.2084.58.camel@domain.hid> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Adeos-main] [PATCH] x86: fix ipipe tracer List-Id: General discussion about Adeos List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sebastian Smolorz Cc: adeos-main On Tue, 2011-04-05 at 16:03 +0200, Sebastian Smolorz wrote: > The ipipe tracer was broken when CONFIG_IPIPE_TRACE_IRQSOFF was > enabled. The reason was that in local_irq_restore_hw(flags) > native irqs were not enabled again. > > Signed-off-by: Sebastian Smolorz > --- > arch/x86/include/asm/irqflags.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/include/asm/irqflags.h > b/arch/x86/include/asm/irqflags.h > index ddfd8cc..6e316c0 100644 > --- a/arch/x86/include/asm/irqflags.h > +++ b/arch/x86/include/asm/irqflags.h > @@ -283,7 +283,7 @@ static inline int irqs_disabled_hw(void) > #define local_irq_restore_hw(flags) do { \ > if ((flags) & X86_EFLAGS_IF) \ > ipipe_trace_end(0x80000001); \ > - native_irq_disable(); \ > + native_restore_fl(flags); \ > } while (0) > > #else /* !CONFIG_IPIPE_TRACE_IRQSOFF */ Queued, thanks. -- Philippe.